Merge branch 'dev'

# Conflicts:
#	app/validate/api/store/order/StoreOrderCreateValidate.php

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

@@ -13,4 +13,24 @@ class PickUpDao extends BaseDao
     {
         return PickUp::class;
     }
+
+    public function search(array $where)
+    {
+        return PickUp::getDB()
+            ->when(isset($where['name']) && $where['name'] !== '', function ($query) use ($where) {
+                $query->where('name', 'like', '%' . $where['name'] . '%');
+            })
+            ->when(isset($where['address']) && $where['address'] !== '', function ($query) use ($where) {
+                $query->where('address', 'like', '%' . $where['address'] . '%');
+            })
+            ->when(isset($where['user_name']) && $where['user_name'] !== '', function ($query) use ($where) {
+                $query->where('user_name', 'like', '%' . $where['user_name'] . '%');
+            })
+            ->when(isset($where['mobile']) && $where['mobile'] !== '', function ($query) use ($where) {
+                $query->where('mobile', 'like', '%' . $where['mobile'] . '%');
+            })
+            ->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
+                $query->where('status', $where['status']);
+            });
+    }
 }

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

@@ -19,6 +19,47 @@ class PickUpRepository extends BaseRepository
 
     public function getlist()
     {
-        return $this->dao->selectWhere(['status'=>1]);
+        return $this->dao->selectWhere(['status' => 1]);
+    }
+
+    /**
+     * @param array $where
+     * @param $page
+     * @param $limit
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 史晨
+     * @date 2026/3/20 10:13
+     * 自提点地址列表
+     */
+    public function adminList(array $params): array
+    {
+        $page = $params['page'] ?? 1;
+        $limit = $params['limit'] ?? 10;
+        unset($params['page'], $params['limit']);
+        $query = $this->dao->search($params);
+        $list = $query->page($page, $limit)
+            ->order('id', 'desc')
+            ->select()
+            ->toArray();
+        $count = $query->count();
+        return ['list' => $list, 'count' => $count];
+    }
+
+    public function add($params)
+    {
+        return $this->dao->create($params);
+    }
+
+    public function get($id)
+    {
+        return $this->dao->get($id);
+    }
+
+    public function update($id, $params)
+    {
+        return $this->dao->update($id, $params);
     }
 }

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

@@ -806,7 +806,8 @@ class StoreGroupOrderRepository extends BaseRepository
                         ->setPension($productEntity->getPension())
                         ->setAttrValuePensionNum($productAttrValueEntity->getPensionNum())
                         ->toArray()
-                )->setPickUpId($storeOrderCreateRequestEntity->getPickUpId());
+                )->setPickUpId($storeOrderCreateRequestEntity->getPickUpId())
+                ->setMark($storeOrderCreateRequestEntity->getMark());
             $storeOrderEntityList[] = $storeOrderEntity;
         }
 

app/common/repositories/user/FeedbackRepository.php

@@ -48,11 +48,19 @@ class FeedbackRepository extends BaseRepository
         })->select();
 
         foreach ($list as &$item) {
-            $userReply = Db::name('feedback_reply')
+            $isReply = Db::name('feedback_reply')
                 ->where(['feedback_id' => $item['feedback_id']])
-                ->where(['admin_read' => 0])
+                ->where(['user_id', '>', 0])
                 ->find();
-            $item['userReply'] = $userReply ? 1 : 0;
+            if (!$isReply) {
+                $item['userReply'] = 0;
+            }else{
+                $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');

app/controller/admin/system/pickUp/PickUp.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace app\controller\admin\system\pickUp;
+
+use app\common\repositories\store\order\PickUpRepository;
+
+class PickUp
+{
+
+    protected $repository;
+
+    /**
+     * @param PickUpRepository $repository
+     */
+    public function __construct(PickUpRepository $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 史晨
+     * @date 2026/3/20 10:13
+     * 自提点地址列表
+     */
+    public function getList()
+    {
+        $params = request()->get();
+        $list = $this->repository->adminList($params);
+        return app('json')->success($list);
+    }
+
+    /**
+     * @return mixed
+     * @author 史晨
+     * @date 2026/3/20 10:32
+     * 添加自提点
+     */
+    public function add()
+    {
+        $params = request()->post();
+        $res = $this->repository->add($params);
+        if (!$res) {
+            return app('json')->fail('添加失败');
+        }
+        return app('json')->success('添加成功');
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     * @author 史晨
+     * @date 2026/3/20 10:32
+     * 获取自提点信息
+     */
+    public function get($id)
+    {
+        $data = $this->repository->get($id);
+        if (!$data) {
+            return app('json')->fail('获取失败');
+        }
+        return app('json')->success($data);
+    }
+
+    /**
+     * @param $id
+     * @return mixed
+     * @author 史晨
+     * @date 2026/3/20 10:33
+     * 更新自提点信息
+     */
+    public function update($id)
+    {
+        $params = request()->post();
+        $res = $this->repository->update($id, $params);
+        if (!$res) {
+            return app('json')->fail('添加失败');
+        }
+        return app('json')->success('添加成功');
+    }
+}

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

@@ -17,9 +17,8 @@ class StoreOrderCreateValidate extends CommonValidate
         'address_id' => 'require|integer',
         'pay_type' => 'require|integer',
         'share_id' => 'integer',
-        'mark' => 'string',
-        // 'pick_up_id' => 'require|integer',
-        'pick_up_id' => 'integer'
+        'mark' => 'max:255',
+        'pick_up_id' => 'require|integer'
     ];
 
     protected $message = [
@@ -34,8 +33,8 @@ class StoreOrderCreateValidate extends CommonValidate
         'pay_type.require' => '支付方式不能为空！',
         'pay_type.integer' => '支付方式类型错误！',
         'share_id.integer' => 'share_id 必须是整数！',
-        'mark.string' => '备注类型错误',
-        // 'pick_up_id.require' => '缺少提货点ID参数!',
+        'mark.between' => '备注超出范围',
+        'pick_up_id.require' => '缺少提货点ID参数!',
         'pick_up_id.integer' => '提货点ID必须是整数！',
     ];
 
@@ -47,7 +46,6 @@ class StoreOrderCreateValidate extends CommonValidate
     public function validateRequest(): array
     {
         $data = $this->request->post();
-        if (!isset($data['pick_up_id'])) $data['pick_up_id'] = 0;
         Log::info('request-api-store-order-create-params：' . json_encode($data));
         if (!$this->check($data)) {
             return ['status' => 'error', 'message' => $this->getError()];

route/admin.php

@@ -100,7 +100,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('lst', '/lst')->name('configAwardLst');
             Route::post('update/:key', '/update')->name('configAwardUpdate');
             Route::get('update/table', '/updateTable')->name('configAwardUpdateForm');
-        })->prefix('admin.system.config.award');    
+        })->prefix('admin.system.config.award');
 
         Route::group('config/others', function () {
             Route::get('lst', 'ConfigOthers/lst')->name('configOthersSettingLst');
@@ -155,7 +155,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
 
         //上传图片
         Route::post('upload/image/:id/:field', 'admin.system.attachment.Attachment/image')->name('uploadImage');
-        
+
         //上传视频
         Route::post('upload/video/:id/:field', 'admin.system.attachment.Attachment/video')->name('merchantUploadVideo');
 
@@ -317,6 +317,14 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('category/form/:id', '/updateForm')->name('systemMerchantCategoryUpdateForm');
         })->prefix('admin.system.merchant.MerchantCategory');
 
+        // 自提点管理
+        Route::group('system/pickUp', function () {
+            Route::get('list', '/getList')->name('systemPickUpList');
+            Route::post('add', '/add')->name('systemPickUpAdd');
+            Route::get('get/:id', '/get')->name('systemPickUpGet');
+            Route::post('update/:id', '/update')->name('systemPickUpUpdate');
+        })->prefix('admin.system.pickUp.PickUp');
+
 
         //用户标签
         Route::group('user/label', function () {
@@ -577,7 +585,7 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::post('upload/image', '/uploadImage')->name('wechatUploadImage');
             Route::post('upload/voice', '/uploadVoice')->name('wechatUploadVoice');
         })->prefix('admin.wechat.WechatReply');
-	
+
 	// 商家管理
         Route::group('merchant/contribute', function () {
             Route::post("list","admin.merchant.MerchantContribute/list");//图片列表