Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init

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

@@ -56,8 +56,8 @@ public class SignValidateFilter implements Filter {
                     "/xfsg/mini/program/v1/partnerManage/partner/getIdentityCardInfo",
                     "/**/swagger*/**",
                     "/**/webjars/**",
-                    "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery",
-                    "/xfsg/mini/**"
+                    "/xfsg/mini/program/v1/partnerManage/openArea/areaApplyQuery"
+                    // "/xfsg/mini/**"
 
             );
 

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

@@ -0,0 +1,30 @@
+package com.cool.store.controller.webb;
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.response.SigningBaseInfoResponse;
+import com.cool.store.service.IntentAgreementService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping({"/pc/IntentAgreement"})
+@Slf4j
+@Api(tags = "PC意向协议")
+public class PCIntentAgreementController {
+
+    @Resource
+    IntentAgreementService intentAgreementService;
+
+    @GetMapping(path = "/get")
+    @ApiOperation("查询意向协议信息")
+    public ResponseResult<SigningBaseInfoResponse> getMiniIntentAgreement(
+            @RequestParam(value = "partnerId", required = false) String partnerId,
+            @RequestParam(value = "lineId", required = false) Long lineId) {
+        SigningBaseInfoResponse resp = intentAgreementService.getMiniIntentAgreement(partnerId, lineId);
+        return ResponseResult.success(resp);
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.cool.store.controller.webb;
+
+
+import com.cool.store.response.ResponseResult;
+import com.cool.store.service.JoinIntentionService;
+import com.cool.store.vo.PartnerBaseInfoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping({"/pc/JoinIntention"})
+@Slf4j
+@Api(tags = "PC意向加盟")
+public class PCJoinIntentionController {
+
+    @Resource
+    private JoinIntentionService joinIntentionService;
+
+    @GetMapping(path = "/getByLineId")
+    @ApiOperation("查找加盟意向申请书")
+    public ResponseResult<PartnerBaseInfoVO> getByLineId(@RequestParam("lineId") Long lineId) {
+        return ResponseResult.success(joinIntentionService.getByLineId(lineId));
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.cool.store.controller.webb;
 
+import com.cool.store.entity.LeaseBaseInfoDO;
 import com.cool.store.enums.ExperienceStatusEnum;
 import com.cool.store.request.TrainingExperienceDistributionRequest;
 import com.cool.store.response.ResponseResult;
@@ -28,4 +29,10 @@ public class PCTrainingExperienceController {
         return ResponseResult.success(trainingExperienceService.distribution(request));
     }
 
+    @ApiOperation("查询实训体验")
+    @GetMapping("/get")
+    public ResponseResult<LeaseBaseInfoDO> getTrainingExperience(@RequestParam("lineId") Long lineId) {
+        return ResponseResult.success(trainingExperienceService.getTrainingExperience(lineId));
+    }
+
 }

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

@@ -42,6 +42,12 @@ public class LineController {
         return ResponseResult.success(lineService.getLineInfo(lineId));
     }
 
+    @ApiOperation("根据线索id查询大区的支付二维码图片")
+    @GetMapping("/getRegionPayPic")
+    public ResponseResult<String> getRegionPayPic(@RequestParam("lineId")Long lineId) {
+        String pic = "https://coolstore-storage.oss-cn-hangzhou.aliyuncs.com/120207001943.png";
+        return ResponseResult.success(pic);
+    }
 
 
 

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

@@ -28,7 +28,7 @@ public class MiniIntentAgreementController {
         return ResponseResult.success(resp);
     }
 
-    @PostMapping(path = "/get")
+    @GetMapping(path = "/get")
     @ApiOperation("查询意向协议信息")
     public ResponseResult<SigningBaseInfoResponse> getMiniIntentAgreement(
             @RequestParam(value = "partnerId",required = false) String partnerId,