Merge branch 'dev'

app/common/dao/shared/SharedProsperityUserGroupLogDao.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace app\common\dao\shared;
+
+use app\common\dao\BaseDao;
+use app\common\model\shared\SharedProsperityUserGroupLog;
+use app\common\model\shared\SharedProsperityUserLevelLog;
+
+class SharedProsperityUserGroupLogDao extends BaseDao
+{
+    protected function getModel(): string
+    {
+        return SharedProsperityUserGroupLog::class;
+    }
+}

app/common/dao/store/order/PickUpDao.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\common\dao\store\order;
+
+
+use app\common\dao\BaseDao;
+use app\common\model\store\order\PickUp;
+
+class PickUpDao extends BaseDao
+{
+
+    protected function getModel(): string
+    {
+        return PickUp::class;
+    }
+}

app/common/dao/user/FeedbackDao.php

@@ -45,15 +45,17 @@ class FeedbackDao extends BaseDao
         return Feedback::getDB()->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
             $query->where('uid', $where['uid']);
         })->when(isset($where['keyword']) && $where['keyword'] !== '', function ($query) use ($where) {
-            $query->where('content','like', '%'.$where['keyword'].'%')->whereOr('reply','like', '%'.$where['keyword'].'%')->whereOr('remake','like', '%'.$where['keyword'].'%');
+            $query->where('content', 'like', '%' . $where['keyword'] . '%')->whereOr('reply', 'like', '%' . $where['keyword'] . '%')->whereOr('remake', 'like', '%' . $where['keyword'] . '%');
         })->when(isset($where['type']) && $where['type'] !== '', function ($query) use ($where) {
-            $query->where('type',$where['type']);
+            $query->where('type', $where['type']);
         })->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
             $query->where('status', $where['status']);
         })->when(isset($where['realname']) && $where['realname'] !== '', function ($query) use ($where) {
-            $query->where('realname','like', '%'.$where['realname'].'%');
+            $query->where('realname', 'like', '%' . $where['realname'] . '%');
         })->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
-            $query->where('is_del',$where['is_del']);
+            $query->where('is_del', $where['is_del']);
+        })->when(isset($where['feedback_id']) && $where['feedback_id'] !== '', function ($query) use ($where) {
+            $query->where('feedback_id', 'in', $where['feedback_id']);
         });
     }
 

app/common/model/shared/SharedProsperityUserGroupLog.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\common\model\shared;
+
+use app\common\model\BaseModel;
+
+class SharedProsperityUserGroupLog extends BaseModel
+{
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'shared_prosperity_user_group_log';
+    }
+}

app/common/model/store/order/PickUp.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * @package merchant
+ *
+ * @author cabbage
+ * @day 2020/11/10
+ **/
+
+namespace app\common\model\store\order;
+
+
+use app\common\model\BaseModel;
+
+class PickUp extends BaseModel
+{
+
+    public static function tablePk(): ?string
+    {
+        return 'id';
+    }
+
+    public static function tableName(): string
+    {
+        return 'pick_up_address';
+    }
+
+
+}

app/common/model/store/order/StoreOrder.php

@@ -88,4 +88,15 @@ class StoreOrder extends BaseModel
             ->where('type', '=', SharedProsperityRewardRecordEnum::TYPE['PV']['code'])
             ->where('pm', '=', SharedProsperityRewardRecordEnum::PM['INCOME']['code']);
     }
+
+    public function pickUp()
+    {
+        return $this->hasOne(PickUp::class, 'id', 'pick_up_id');
+    }
+
+    public function takeStatus()
+    {
+        return $this->hasOne(StoreOrderStatus::class,'order_id','order_id')
+            ->where('change_type', '=', 'take');
+    }
 }

app/common/model/user/Feedback.php

@@ -43,4 +43,10 @@ class Feedback extends BaseModel
     {
         return $this->hasOne(FeedBackCategory::class,'feedback_category_id','type');
     }
+
+
+    public function getReply()
+    {
+        return $this->hasMany(FeedbackReply::class, 'feedback_id', 'feedback_id');
+    }
 }

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -5,6 +5,7 @@ namespace app\common\repositories\shared;
 use app\common\dao\shared\SharedProsperityGroupUserDao;
 use app\common\dao\shared\SharedProsperityRewardRecordDao;
 use app\common\dao\shared\SharedProsperityUserDao;
+use app\common\dao\shared\SharedProsperityUserGroupLogDao;
 use app\common\dao\shared\SharedProsperityUserLevelLogDao;
 use app\common\dao\shared\SharedProsperityUserParentLogDao;
 use app\common\dao\user\UserDao;
@@ -12,6 +13,8 @@ use app\common\dao\user\UserWithdrawalLimitRecordDao;
 use app\common\enum\CommonEnum;
 use app\common\enum\shared\SharedProsperityRewardRecordEnum;
 use app\common\enum\shared\SharedProsperityUserEnum;
+use app\common\model\shared\SharedProsperityGroupUser;
+use app\common\model\shared\SharedProsperityUserParentLog;
 use app\common\repositories\BaseRepository;
 use app\common\repositories\store\order\StoreCartRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
@@ -849,6 +852,54 @@ class SharedProsperityUserRepository extends BaseRepository
         }
     }
 
+    /**
+     * @param $userId
+     * @param $groupId
+     * @param $remark
+     * @param $operator
+     * @return string|void
+     * @author 史晨
+     * @date 2026/3/17 17:19
+     * 更新用户分组
+     */
+    public function updateGroup($userId, $groupId, $remark, $operator)
+    {
+        $userGroup = SharedProsperityGroupUser::where(['user_id' => $userId, 'status' => 1])->find();
+        $userGroupId = $userGroup->group_id??0;
+        Db::startTrans();
+        try {
+            // 变更等级
+            if ($userGroup) {
+                $update = [
+                    'group_id' => $groupId,
+                    'status' => 1
+                ];
+                SharedProsperityGroupUser::update($update, ['user_id' => $userId]);
+            }else{
+                $insert = [
+                    'user_id' => $userId,
+                    'group_id' => $groupId,
+                    'status' => 1
+                ];
+                SharedProsperityGroupUser::create($insert);
+            }
+            // 记录日志
+            /** @var SharedProsperityUserGroupLogDao $logDao */
+            $logDao = app()->make(SharedProsperityUserGroupLogDao::class);
+            $logDao->create([
+                'user_id' => $userId,
+                'old_group' => $userGroupId,
+                'new_group' => $groupId,
+                'operator' => $operator,
+                'remark' => $remark
+            ]);
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            return $e->getMessage();
+        }
+    }
+
 
     /**
      * @param $userId

app/common/repositories/store/order/PickUpRepository.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace app\common\repositories\store\order;
+
+use app\common\dao\store\order\PickUpDao;
+use app\common\repositories\BaseRepository;
+
+class PickUpRepository extends BaseRepository
+{
+    /**
+     * @param PickUpDao $dao
+     */
+    public function __construct(PickUpDao $dao)
+    {
+        $this->dao = $dao;
+        $this->source = request()->header('source');
+        $this->merId = request()->header('merId');
+    }
+
+    public function getlist()
+    {
+        return $this->dao->selectWhere(['status'=>1]);
+    }
+}

app/common/repositories/store/order/StoreGroupOrderRepository.php

@@ -422,15 +422,17 @@ class StoreGroupOrderRepository extends BaseRepository
             throw new ValidateException('获取当前用户信息失败');
         }
 
-        /** 验证 收货地址 */
+        /** 验证 收货地址 会员专区，共富区可自提，如果选的自提不验证收货地址 */
         /** @var UserAddressRepository $userAddressRepository */
         $userAddressRepository = app()->make(UserAddressRepository::class);
         $addressEntity = $userAddressRepository->getAddressEntityByAddressId($storeOrderCreateRequestEntity->getAddressId());
-        if (empty($addressEntity->getAddressId()) || $addressEntity->getUid() != $storeOrderCreateRequestEntity->getUid()) {
-            throw new ValidateException('请选择正确的收货地址');
-        }
-        if (empty($addressEntity->getCodeList())) {
-            throw new ValidateException('地址需要选择4级地址！请修改地址！');
+        if ($storeOrderCreateRequestEntity->getPickUpId() == 0) {
+            if (empty($addressEntity->getAddressId()) || $addressEntity->getUid() != $storeOrderCreateRequestEntity->getUid()) {
+                throw new ValidateException('请选择正确的收货地址');
+            }
+            if (empty($addressEntity->getCodeList())) {
+                throw new ValidateException('地址需要选择4级地址！请修改地址！');
+            }
         }
 
         /** 验证 购物车信息 */
@@ -804,7 +806,7 @@ class StoreGroupOrderRepository extends BaseRepository
                         ->setPension($productEntity->getPension())
                         ->setAttrValuePensionNum($productAttrValueEntity->getPensionNum())
                         ->toArray()
-                );
+                )->setPickUpId($storeOrderCreateRequestEntity->getPickUpId());
             $storeOrderEntityList[] = $storeOrderEntity;
         }
 

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2718,7 +2718,7 @@ class StoreOrderRepository extends BaseRepository
 //        if ($uid) $where['uid'] = $uid;
 
         $data = $this->dao->search($where)->where('order_sn', $id)->where('is_del', 0)->with([
-            'orderProduct', 'merchant' => function ($query) {
+            'orderProduct','pickUp', 'merchant' => function ($query) {
                 return $query->field('mer_id,mer_name,mer_avatar,business_id');
             }
         ])
@@ -5048,7 +5048,7 @@ class StoreOrderRepository extends BaseRepository
                 $query->field('uid,real_name,nickname');
             }, 'StoreRefundOrder' => function ($query) {
                 return $query->field('*');
-            }
+            }, 'pickUp','takeStatus'
         ]);
 
         $data = $data->toArray();
@@ -5166,7 +5166,8 @@ class StoreOrderRepository extends BaseRepository
         unset($where['status']);
         $query_search = $this->dao->search($where)
             // 屏蔽测试账号
-            ->whereNotIn('uid', [766, 783, 6])
+            // ->whereNotIn('uid', [766, 783, 6])
+            ->whereNotIn('uid', [ 783, 6])
             ->when(isset($where['order_ids']) && $where['order_ids'] != '', function ($q) use ($where) {
             $q->whereIn('order_id', $where['order_ids']);
         });

app/common/repositories/user/FeedbackRepository.php

@@ -13,8 +13,10 @@ namespace app\common\repositories\user;
 
 use app\common\dao\user\FeedbackDao;
 use app\common\dao\user\FeedbackReplyDao;
+use app\common\model\user\Feedback;
 use app\common\model\user\FeedbackReply;
 use app\common\repositories\BaseRepository;
+use think\facade\Db;
 
 /**
  * Class FeedbackRepository
@@ -36,24 +38,52 @@ class FeedbackRepository extends BaseRepository
 
     public function getList(array $where, $page, $limit)
     {
-        $query = $this->dao->search($where)->with(['type' => function($query){
+        $query = $this->dao->search($where)->with(['type' => function ($query) {
             $query->field('feedback_category_id,cate_name');
         }]);
 
         $count = $query->count();
-        $list = $query->page($page, $limit)->order("feedback_id desc")->withAttr('images',function($val){
+        $list = $query->page($page, $limit)->order("feedback_id desc")->withAttr('images', function ($val) {
             return $val ? json_decode($val, true) : [];
         })->select();
+
+        foreach ($list as &$item) {
+            $userReply = Db::name('feedback_reply')
+                ->where(['feedback_id' => $item['feedback_id']])
+                ->where(['admin_read' => 0])
+                ->find();
+            $item['userReply'] = $userReply ? 1 : 0;
+        }
+
         return compact('count', 'list');
     }
 
-    public function get( $id)
+    public function getReplyList($userId, $page, $limit)
     {
-        $data = $this->dao->getWhere([$this->dao->getPk() => $id]);
+
+        $feedbackIds = Db::name('feedback')
+            ->alias('feed')
+            ->leftJoin('feedback_reply reply', 'feed.feedback_id = reply.feedback_id')
+            ->where(['feed.uid' => $userId,'reply.user_read' => 0])
+            ->group('feed.feedback_id')
+            ->field('feed.feedback_id')
+            ->select()
+            ->toArray();
+        $feedbackIds = array_column($feedbackIds,'feedback_id');
+        return $this->getList(['feedback_id'=>$feedbackIds], $page, $limit);
+    }
+
+    public function get($id, $read = 'user_read')
+    {
+        // 获取反馈信息
+        $data = $this->dao->getWhere([$this->dao->getPk() => $id], '*', ['getReply']);
         $type = app()->make(FeedBackCategoryRepository::class)->getWhere(['feedback_category_id' => $data['type']]);
         $parent = app()->make(FeedBackCategoryRepository::class)->getWhere(['feedback_category_id' => $type['pid']]);
         $data['type'] = $type['cate_name'];
         $data['category'] = $parent['cate_name'];
+
+        // 更改已读状态
+        $this->read($id, $read);
         return $data;
     }
 
@@ -73,7 +103,20 @@ class FeedbackRepository extends BaseRepository
             'uid' => $userId,
             'content' => $content,
         ];
+        if ($userId == 0) $insert['admin_read'] = 1;
         return FeedbackReply::insert($insert);
     }
 
+    /**
+     * @param $feedbackId
+     * @param $type
+     * @return void
+     * @author 史晨
+     * @date 2026/3/17 14:37
+     * 更改已读状态
+     */
+    public function read($feedbackId, $type)
+    {
+        FeedbackReply::update([$type => 1], ['feedback_id' => $feedbackId]);
+    }
 }

app/controller/admin/system/sharedProsperity/SharedProsperityUser.php

@@ -82,4 +82,28 @@ class SharedProsperityUser
         }
         return app('json')->success('更新成功');
     }
+
+    /**
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 史晨
+     * @date 2026/3/17 17:18
+     * 更新用户分组
+     */
+    public function updateGroup()
+    {
+        /** @var SharedProsperityUserRepository $repository */
+        $repository = app()->make(SharedProsperityUserRepository::class);
+        $params = app('request')->params(['user_id', 'group_id', 'remark']);
+        if (empty($params['user_id']) || empty($params['group_id'] || empty($params['remark']))) {
+            return app('json')->fail('参数错误');
+        }
+        $res = $repository->updateGroup($params['user_id'], $params['group_id'], $params['remark'], request()->adminId());
+        if (is_string($res)) {
+            return app('json')->fail($res);
+        }
+        return app('json')->success('更新成功');
+    }
 }

app/controller/admin/user/FeedBack.php

@@ -47,9 +47,9 @@ class FeedBack extends BaseController
      */
     public function detail($id)
     {
-        if (!$this->repository->fieldExists('feedback_id',$id))
+        if (!$this->repository->fieldExists('feedback_id', $id))
             return app('json')->fail('数据不存在');
-        $feedback = $this->repository->get($id)->toArray();
+        $feedback = $this->repository->get($id, 'admin_read')->toArray();
         //[$feedback['category'], $feedback['type']] = explode('/', $feedback['type'], 2);
         return app('json')->success($feedback);
     }
@@ -62,11 +62,12 @@ class FeedBack extends BaseController
      */
     public function reply($id)
     {
-        if (!$this->repository->fieldExists('feedback_id',$id))
+        if (!$this->repository->fieldExists('feedback_id', $id))
             return app('json')->fail('数据不存在');
         $data = $this->request->params(['reply', 'remake', 'status']);
         $data['reply_time'] = date("Y-m-d H:i:s");
-        $this->repository->update($id,$data);
+        $this->repository->update($id, $data);
+        $this->repository->reply($id, 0,$data['reply']);
         return app('json')->success('回复成功');
     }
 

app/controller/api/store/order/StoreOrder.php

@@ -13,6 +13,7 @@ namespace app\controller\api\store\order;
 
 use app\common\model\store\order\StoreRefundOrder;
 use app\common\repositories\merchant\MerchantRepository;
+use app\common\repositories\store\order\PickUpRepository;
 use app\common\repositories\store\product\ProductAttrValueRepository;
 use app\common\repositories\user\UserAddressRepository;
 use app\entity\request\api\store\order\CalculatePostageRequestEntity;
@@ -1991,4 +1992,17 @@ class StoreOrder extends BaseController
             'postage' => $postage
         ]);
     }
+
+    /**
+     * @param PickUpRepository $pickUpRepository
+     * @return mixed
+     * @author 史晨
+     * @date 2026/3/18 15:07
+     * 提货点列表
+     */
+    public function pickUpList(PickUpRepository $pickUpRepository)
+    {
+        $list = $pickUpRepository->getlist();
+        return app('json')->success($list);
+    }
 }

app/controller/api/user/Feedback.php

@@ -52,8 +52,10 @@ class Feedback
      */
     public function feedbackList()
     {
-        [$page, $limit] = $this->getPage();
-        return app('json')->success($this->repository->getList(['uid' => request()->uid(), 'is_del' => 0], $page, $limit));
+        $data = request()->params(['page', 'limit']);
+        $list = $this->repository->getList(['uid' => request()->uid(), 'is_del' => 0], $data['page'] ?? 1, $data['limit'] ?? 20);
+        $reply = $this->repository->getReplyList(request()->uid(), $data['page'] ?? 1, $data['limit'] ?? 20);
+        return app('json')->success(['list' => $list, 'replyList' => $reply]);
     }
 
     public function detail($id)

app/controller/api/user/UserAddress.php

@@ -71,16 +71,21 @@ class UserAddress extends BaseController
     public function new_create(validate $validate)
     {
         $data = $this->checkParams($validate);
-        if($data['is_default']){
+        if ($data['is_default']) {
             $this->repository->changeDefault($this->request->uid());
         } else {
-            if(!$this->repository->defaultExists($this->request->uid()))$data['is_default'] = 1;
+            if (!$this->repository->defaultExists($this->request->uid())) $data['is_default'] = 1;
         }
-        if($data['address_id']){
-            if(!$this->repository->fieldExists($data['address_id'],$this->request->uid()))
+        if (!$data['code_list']) {
+            return app('json')->fail('请选择完整地址');
+        }
+        if ($data['address_id']) {
+            if (!$this->repository->fieldExists($data['address_id'], $this->request->uid())) {
                 return app('json')->fail('信息不存在');
-            $this->repository->update($data['address_id'],$data);
-            return app('json')->success('编辑成功', ['address_id'=>$data['address_id']]);
+            }
+
+            $this->repository->update($data['address_id'], $data);
+            return app('json')->success('编辑成功', ['address_id' => $data['address_id']]);
         };
         $data['uid'] = $this->request->uid();
         $address = $this->repository->create($data);

app/entity/data/store/StoreOrderEntity.php

@@ -101,6 +101,8 @@ class StoreOrderEntity extends DataEntity
     public $fzonePayType = null;
     public $pensionJson = null; // 养老金设置（将当前商品的养老金分配设置保存一份）
 
+    public $pickUpId = null;
+
     /**
      * @return mixed
      */
@@ -1771,6 +1773,17 @@ class StoreOrderEntity extends DataEntity
         return $this;
     }
 
+    public function getPickUpId()
+    {
+        return $this->pickUpId;
+    }
+
+    public function setPickUpId($pickUpId): StoreOrderEntity
+    {
+        $this->pickUpId = $pickUpId;
+        return $this;
+    }
+
     public function deconstructionFzonePaytype()
     {
         if (!empty($this->getFzonePayType()) && is_array(json_decode($this->getFzonePayType(), true))) {

app/entity/request/api/store/order/StoreOrderCreateRequestEntity.php

@@ -15,6 +15,7 @@ class StoreOrderCreateRequestEntity extends RequestCommonEntity
     public $fzonePayType = [];
     public $shareId = 0;
     public $uid = 0;
+    public $pickUpId = 0;
 
     public function getCartId(): int
     {
@@ -124,4 +125,15 @@ class StoreOrderCreateRequestEntity extends RequestCommonEntity
         $this->uid = $uid;
         return $this;
     }
+
+    public function getPickUpId():int
+    {
+        return $this->pickupId;
+    }
+
+    public function setPickUpId(int $pickupId): StoreOrderCreateRequestEntity
+    {
+        $this->pickupId = $pickupId;
+        return $this;
+    }
 }

app/validate/api/store/order/StoreOrderCreateValidate.php

@@ -14,10 +14,11 @@ class StoreOrderCreateValidate extends CommonValidate
         'cart_id' => 'require|integer',
         'cart_id_list' => 'array',
         'fzone_paytype' => 'require',
-        'address_id' => 'require|integer|gt:0',
+        'address_id' => 'require|integer',
         'pay_type' => 'require|integer',
         'share_id' => 'integer',
-        'mark' => 'string'
+        'mark' => 'string',
+        'pick_up_id' => 'require|integer'
     ];
 
     protected $message = [
@@ -28,11 +29,13 @@ class StoreOrderCreateValidate extends CommonValidate
         // 'fzone_paytype.string' => '支付方式必须是字符串！',
         'address_id.require' => '地址ID不能为空！',
         'address_id.integer' => '地址ID必须是整数！',
-        'address_id.gt' => '地址ID必须大于0！',
+        // 'address_id.gt' => '地址ID必须大于0！',
         'pay_type.require' => '支付方式不能为空！',
         'pay_type.integer' => '支付方式类型错误！',
         'share_id.integer' => 'share_id 必须是整数！',
-        'mark.string' => '备注类型错误'
+        'mark.string' => '备注类型错误',
+        'pick_up_id.require' => '缺少提货点ID参数!',
+        'pick_up_id.integer' => '提货点ID必须是整数！',
     ];
 
     /**

route/admin.php

@@ -126,6 +126,8 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
         Route::get('sharedProsperity/user/updateReward', 'admin.system.sharedProsperity.SharedProsperityUser/updateReward');
         // 修改共富会员上级
         Route::get('sharedProsperity/user/updateParent', 'admin.system.sharedProsperity.SharedProsperityUser/updateParent');
+        // 修改共富团队等级
+        Route::get('sharedProsperity/user/updateGroup', 'admin.system.sharedProsperity.SharedProsperityUser/updateGroup');
 
         //组合数据
         Route::group('group', function () {

route/api.php

@@ -124,7 +124,8 @@ Route::group('api/', function () {
             Route::get('check_group_order/:id', '/check_group_order');
             //代付商品分享图片
             Route::get('order_pay_share','/order_pay_share');
-
+            // 提货点
+            Route::get('pick_up_list','/pickUpList');
 
         })->prefix('api.store.order.StoreOrder');