feat:创建共富商城预约订单

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchPickUpService.java

@@ -0,0 +1,19 @@
+package com.bsd.pjcloud.wallet.api.feign;
+
+import com.bsd.pjcloud.common.core.constant.ServiceNameConstants;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.feign.annotation.NoToken;
+import com.bsd.pjcloud.wallet.api.vo.mch.MchPickUpVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+@FeignClient(contextId = "remoteMchPickUpService", value = ServiceNameConstants.WALLET_SERVICE)
+public interface RemoteMchPickUpService {
+
+    @NoToken
+    @GetMapping("/mch-pick-up/remotedetail")
+    R<MchPickUpVo> remoteDetail(@RequestParam("id") Long id);
+
+}

pjcloud-wallet/pjcloud-wallet-api/src/main/resources/META-INF/spring/org.springframework.cloud.openfeign.FeignClient.imports

@@ -1,5 +1,6 @@
 com.bsd.pjcloud.wallet.api.feign.RemoteActCancelService
 com.bsd.pjcloud.wallet.api.feign.RemoteWalletService
+com.bsd.pjcloud.wallet.api.feign.RemoteMchPickUpService
 com.bsd.pjcloud.wallet.api.feign.RemoteMchRuleJoinService
 com.bsd.pjcloud.wallet.api.feign.RemoteCodeUseService
 com.bsd.pjcloud.wallet.api.feign.RemoteWalletRechargeService

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/mch/MchPickUpController.java

@@ -2,15 +2,16 @@ package com.bsd.pjcloud.wallet.controller.mch;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.common.security.annotation.Inner;
 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.api.vo.mch.MchPickUpVo;
 import com.bsd.pjcloud.wallet.service.MchPickUpService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -36,18 +37,28 @@ public class MchPickUpController {
 
     private final MchPickUpService mchPickUpService;
 
+    /* ************************************* start 远程调用 start ************************************* */
+
+    @Inner
+    @GetMapping("/remotedetail")
+    public R<MchPickUpVo> remoteDetail(@RequestParam("id") Long id) {
+        return R.ok(mchPickUpService.join(id));
+    }
+
+    /* ************************************* end 远程调用 end ************************************* */
+
     /* ************************************* start app start ************************************* */
 
     @Operation(summary = "分页查询", description = "分页查询")
-    @GetMapping("app/page")
-    public R appPage(@ParameterObject Page page, @ParameterObject MchPickUpDto dto) {
+    @GetMapping("/app/page")
+    public R<Page<MchPickUpVo>> 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) {
+    @GetMapping("/app/detail")
+    public R<MchPickUpVo> appDetail(@RequestParam("id") Long id) {
         return R.ok(mchPickUpService.join(id));
     }