feat:自提点前端接口

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;
+
     /**
      * 创建人
      */

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")

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();

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>