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

coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java

@@ -188,6 +188,9 @@ public enum ErrorCodeEnum {
     AUDIT_RESULT_FALSE(109012, "意向加盟合同API本次调用结果与上一次不一致", null),
 
 
+    TIME_NULL_FALSE(109013, "有时间为空", null),
+
+
     INSERT_OPENING_OPERATION_PLAN_AUDIT_FALSE(103001,"插入运营方案审核信息失败",null),
     INSERT_OPENING_OPERATION_PLAN_FALSE(103002,"插入运营方案失败",null),
     SHOP_ID_IS_NULL(103003,"验参shopId失败，为空",null),

coolstore-partner-model/src/main/java/com/cool/store/request/InitiatingRequest.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 @Data
 public class InitiatingRequest {
@@ -105,6 +106,10 @@ public class InitiatingRequest {
 
     private String csfzName;
 
+    private Date signStartTime;
+
+    private Date signEndTime;
+
 
     public InitiatingDO toInitiatingDO() {
         InitiatingDO initiatingDO = new InitiatingDO();
@@ -115,14 +120,14 @@ public class InitiatingRequest {
         initiatingDO.setTitle("加盟意向协议-" + this.signName + "-" + dateTime);
         initiatingDO.setApply_date(this.apply_date);
         initiatingDO.setJms_id_card(this.idCardNo);
-        if (StringUtil.isNotBlank(this.businessLicenseAddress)){
+        if (StringUtil.isNotBlank(this.businessLicenseAddress)) {
             initiatingDO.setJms_id_card_address(this.businessLicenseAddress);
-        }else if (StringUtil.isNotBlank(this.idCardAddress)){
+        } else if (StringUtil.isNotBlank(this.idCardAddress)) {
             initiatingDO.setJms_id_card_address(this.idCardAddress);
         }
-        if (StringUtil.isNotBlank(this.businessLicenseCode)){
+        if (StringUtil.isNotBlank(this.businessLicenseCode)) {
             initiatingDO.setJms_id_card(this.businessLicenseCode);
-        }else if (StringUtil.isNotBlank(this.idCardNo)){
+        } else if (StringUtil.isNotBlank(this.idCardNo)) {
             initiatingDO.setJms_id_card(this.idCardNo);
         }
         initiatingDO.setJms_name(this.signName);
@@ -133,12 +138,12 @@ public class InitiatingRequest {
         initiatingDO.setAnnex1(this.annex1);
         initiatingDO.setAnnex2(this.annex2);
         initiatingDO.setAnnex3(this.annex3);
-        initiatingDO.setQy_year(this.qy_year);
+        initiatingDO.setQy_year(this.signStartTime.getYear());
-        initiatingDO.setQy_month(this.qy_month);
+        initiatingDO.setQy_month(this.signStartTime.getMonth());
-        initiatingDO.setQy_day(this.qy_day);
+        initiatingDO.setQy_day(this.signStartTime.getDay());
-        initiatingDO.setJy_year(this.jy_year);
+        initiatingDO.setJy_year(this.signEndTime.getYear());
-        initiatingDO.setJy_month(this.jy_month);
+        initiatingDO.setJy_month(this.signEndTime.getMonth());
-        initiatingDO.setJy_day(this.jy_day);
+        initiatingDO.setJy_day(this.signEndTime.getDay());
         initiatingDO.setYxjzz(this.yxjzz);
         initiatingDO.setXyqx_month(this.xyqx_month);
         initiatingDO.setJmf(this.jmf);

coolstore-partner-model/src/main/java/com/cool/store/request/TrainingExperienceDistributionRequest.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Data
@@ -15,8 +16,10 @@ public class TrainingExperienceDistributionRequest {
     @ApiModelProperty("用户信息表partnerId")
     private String partnerId;
     @ApiModelProperty("体验门店id")
+    @NotNull(message = "门店id为空")
     private String storeId;
     @ApiModelProperty("门店名")
+    @NotNull(message = "门店名为空")
     private String storeName;
     @ApiModelProperty("开始体验时间")
     private Date experienceStartTime;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java

@@ -188,6 +188,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
         if (Objects.isNull(request)) {
             throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
         }
+        verifyDate(request);
         Map<String, Object> requestMap = new HashMap<>();
         fillSignatureInfo(requestMap);
         String url = xfsgUrl + Constants.INTENTION_CONTRACT_URL + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature");
@@ -211,6 +212,15 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
         }
     }
 
+    private void verifyDate(InitiatingRequest request) {
+        if (request.getSignStartTime() == null || request.getSignEndTime() == null) {
+            throw new ServiceException(ErrorCodeEnum.TIME_NULL_FALSE);
+        }
+        if (request.getSignStartTime().after(request.getSignEndTime())) {
+            throw new ServiceException(ErrorCodeEnum.TIME_FALSE);
+        }
+    }
+
     @Override
     public InitiatingRequest getOaDetail(String mobile, String idCardNo) {
         String redisKey = "OA:" + mobile + idCardNo;

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

@@ -422,7 +422,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
     @Transactional(rollbackFor = Exception.class)
     public Boolean rePay(Long shopId) {
         shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71);
-        shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_7);
+        shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_8);
         return true;
     }
 }

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

@@ -1,18 +1,16 @@
 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;
 import com.cool.store.service.TrainingExperienceService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.websocket.server.PathParam;
 
 @RestController
 @RequestMapping("/pc/training/experience/")
@@ -25,7 +23,7 @@ public class PCTrainingExperienceController {
 
     @ApiOperation("实训体验分配或更新")
     @PostMapping("/distribution")
-    public ResponseResult<Boolean> distribution(@RequestBody TrainingExperienceDistributionRequest request) {
+    public ResponseResult<Boolean> distribution(@RequestBody @Validated TrainingExperienceDistributionRequest request) {
         return ResponseResult.success(trainingExperienceService.distribution(request));
     }