From 51f22a4df2ebd271c68a1c0562e2cd0a078c24a5 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 20 Oct 2025 16:53:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=87=AA=E6=8F=90=E7=82=B9=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/entity/mch/MchPickUpEntity.java       |  6 ++++++
 .../controller/mch/MchPickUpController.java   | 19 +++++++++++++++++++
 .../impl/mch/MchPickUpServiceImpl.java        |  3 +++
 .../resources/mapper/mch/MchPickUpMapper.xml  |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchPickUpEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchPickUpEntity.java
index cbf374648..063200704 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchPickUpEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/mch/MchPickUpEntity.java
@@ -82,6 +82,12 @@ public class MchPickUpEntity extends Model<MchPickUpEntity> {
     @Schema(description = "营业时间")
     private String businessHoursJson;
 
+    /**
+     * 排序
+     */
+    @Schema(description = "排序")
+    private Long sort;
+
     /**
      * 创建人
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPickUpController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPickUpController.java
index 2b349e2b8..b15b796a3 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPickUpController.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPickUpController.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.wallet.api.constant.mch.WalletMchPickUpStatusEnum;
 import com.bsd.pjcloud.wallet.api.dto.mch.MchPickUpDto;
 import com.bsd.pjcloud.wallet.api.entity.mch.MchPickUpEntity;
 import com.bsd.pjcloud.wallet.service.MchPickUpService;
@@ -35,6 +36,24 @@ public class MchPickUpController {
 
     private final MchPickUpService mchPickUpService;
 
+    /* ************************************* start app start ************************************* */
+
+    @Operation(summary = "分页查询", description = "分页查询")
+    @GetMapping("app/page")
+    public R appPage(@ParameterObject Page page, @ParameterObject MchPickUpDto dto) {
+        dto.setStatus(WalletMchPickUpStatusEnum.COOPERATION_SUCCESS.getCode());
+        return R.ok(mchPickUpService.scopPageJoin(page, dto, null));
+    }
+
+    @Operation(summary = "查询详情", description = "查询详情")
+    @GetMapping("app/detail")
+    public R appDetail(@RequestParam("id") Long id) {
+        return R.ok(mchPickUpService.join(id));
+    }
+
+
+    /* ************************************* end app end ************************************* */
+
 
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java
index e03cdac73..e96fa303e 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/mch/MchPickUpServiceImpl.java
@@ -60,6 +60,9 @@ public class MchPickUpServiceImpl extends ServiceImpl<MchPickUpMapper, MchPickUp
         if (ObjectUtil.isEmpty(saveObj.getStatus())) {
             saveObj.setStatus(WalletMchPickUpStatusEnum.COOPERATION_ERROR.getCode());
         }
+        if (ObjectUtil.isEmpty(saveObj.getSort())) {
+            saveObj.setSort(0L);
+        }
         baseMapper.insert(saveObj);
         getSelf().generatePickUpJoin(dto.getId(), dto.getMchIds());
         return saveObj.getId();
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml
index a62194152..a08926367 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/mch/MchPickUpMapper.xml
@@ -13,6 +13,7 @@
                a.longitude,
                a.detail_address,
                a.business_hours_json,
+               a.sort,
                a.create_by,
                a.create_time,
                a.update_by,
@@ -40,5 +41,6 @@
         <where>
             <include refid="whereA"/>
         </where>
+        order by a.sort, a.create_time
     </select>
 </mapper>
\ No newline at end of file