新店装修阶段2.0+修改查询运营列表PSOT

coolstore-partner-web/src/main/java/com/cool/store/config/SignValidateFilter.java

@@ -53,6 +53,8 @@ public class SignValidateFilter implements Filter {
                     "/xfsg/favicon.ico",
                     "/xfsg/v2/api-docs","/**/test/**",
                     "/xfsg/mini/program/oss/getUploadFileConfig",
+                    //
+                    "/xfsg/mini/decoration/**",
                     "/xfsg/mini/program/v1/partnerManage/partner/getIdentityCardInfo",
                     "/**/swagger*/**",
                     "/**/webjars/**",

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenPreparationController.java

@@ -36,7 +36,7 @@ import java.util.List;
  * @注释:
  */
 @RestController
-@RequestMapping("/pc/OpenPreparation")
+@RequestMapping("/pc/openPreparation")
 @Api(tags = "pc开业筹备")
 @Slf4j
 public class OpenPreparationController {
@@ -71,7 +71,7 @@ public class OpenPreparationController {
         return ResponseResult.success(auditOpeningOperationPlanService.auditPlan(request));
     }
 
-    @GetMapping("/openingOperationPlan/planList")
+    @PostMapping("/openingOperationPlan/planList")
     @ApiOperation("查询运营方案列表")
     public ResponseResult<PageInfo<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) {
         return ResponseResult.success(openingOperationPlanService.getPlanListPage(request));

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCDecorationController.java

@@ -6,6 +6,7 @@ import com.cool.store.dto.decoration.ConstructionScheduleDTO;
 import com.cool.store.dto.decoration.DecorationDTO;
 import com.cool.store.dto.decoration.DecorationModelDTO;
 import com.cool.store.request.DecorationPayRequest;
+import com.cool.store.request.LinePaySubmitRequest;
 import com.cool.store.response.ResponseResult;
 import com.cool.store.service.CoolStoreStartFlowService;
 import com.cool.store.service.DecorationService;
@@ -13,6 +14,7 @@ import com.cool.store.service.YlfService;
 import com.cool.store.vo.DesignInfoVo;
 import com.cool.store.vo.PartnerUserInfoVO;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -32,22 +34,19 @@ import java.util.List;
 public class PCDecorationController {
     @Resource
     private DecorationService decorationService;
+    @ApiModelProperty("获取设计阶段信息")
     @GetMapping("/design")
-    public ResponseResult<DesignInfoVo> get(@RequestParam String shopCode){
-        return ResponseResult.success( decorationService.DesignInfo(shopCode)) ;
+    public ResponseResult<DesignInfoVo> get(@RequestParam Long shopId){
+        return ResponseResult.success( decorationService.DesignInfo(shopId)) ;
     }
+    @ApiModelProperty("获取装修款信息,和二维码")
     @GetMapping("/getDecorationModel")
-    public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam String shopCode){
-        return ResponseResult.success(decorationService.DecorationModel(shopCode)) ;
-    }
-    @PostMapping("/submitDecorationModel")
-    public ResponseResult submitDecorationModel(@RequestBody DecorationPayRequest DecorationPayRequest){
-        PartnerUserInfoVO user = PartnerUserHolder.getUser();
-        decorationService.submitDecorationModel(DecorationPayRequest, user);
-        return ResponseResult.success();
+    public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam Long shopId){
+        return ResponseResult.success(decorationService.DecorationModel(shopId)) ;
     }
+    @ApiModelProperty("获取施工阶段信息")
     @GetMapping("/getConstruction")
-    public  ResponseResult<List<ConstructionScheduleDTO>> getConstruction(@RequestParam String shopCode){
-        return ResponseResult.success(decorationService.getConstruction(shopCode)) ;
+    public  ResponseResult<List<ConstructionScheduleDTO>> getConstruction(@RequestParam Long shopId){
+        return ResponseResult.success(decorationService.getConstruction(shopId)) ;
     }
 }

coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java

@@ -0,0 +1,37 @@
+package com.cool.store.controller.webc;
+
+import com.cool.store.context.PartnerUserHolder;
+import com.cool.store.request.LinePaySubmitRequest;
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.DecorationService;
+import com.cool.store.vo.PartnerUserInfoVO;
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/04/29/下午2:46
+ * @Version 1.0
+ * @注释:
+ */
+@RestController
+@RequestMapping("/mini/decoration")
+@Api(tags = "mini装修阶段")
+@Slf4j
+public class MiniDecorationController {
+    @Resource
+    private DecorationService decorationService;
+    @PostMapping("/submitDecorationModel")
+    public ResponseResult submitDecorationModel(@RequestBody LinePaySubmitRequest linePaySubmitRequest){
+        PartnerUserInfoVO user = PartnerUserHolder.getUser();
+        user.setPartnerId("61bf57dc65334885802a278835f499d0");
+        decorationService.submitDecorationModel(linePaySubmitRequest, user);
+        return ResponseResult.success();
+    }
+}

coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java

@@ -108,9 +108,9 @@ public class XxlJobHandler {
                 log.info("------今日没有待更新数据------");
                 return;
             }
-            List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.queryShopCodeListByid(shopIdListByStageStatus);
+            List<OpenPlanShopInfoDTO> openPlanShopInfoDTOS = shopInfoDAO.queryStoreNumeListByid(shopIdListByStageStatus);
             Map<Long, String> map = openPlanShopInfoDTOS.stream().
-                    collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, OpenPlanShopInfoDTO::getShopCode));
+                    collect(Collectors.toMap(OpenPlanShopInfoDTO::getShopId, OpenPlanShopInfoDTO::getStoreNum));
             for (Long shopId : map.keySet()){
                 String shopCode = map.get(shopId);
                 try {