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

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

@@ -47,11 +47,6 @@ public class FranchiseeSaveRequest {
         franchiseeDO.setIdCardAddress(this.idCardAddress);
         franchiseeDO.setIdCardBackUrl(this.idCardBackUrl);
         franchiseeDO.setIdCardFrontUrl(this.idCardFrontUrl);
-        if (this.sex == 1){
-            franchiseeDO.setSex(1);
-        }else if (this.sex == 2){
-            franchiseeDO.setSex(0);
-        }
         franchiseeDO.setSignType(this.signType);
         return franchiseeDO;
     }

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

@@ -2,11 +2,13 @@ package com.cool.store.request;
 
 import com.cool.store.entity.InitiatingDO;
 import com.cool.store.utils.StringUtil;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Calendar;
 import java.util.Date;
 
 @Data
@@ -138,12 +140,12 @@ public class InitiatingRequest {
         initiatingDO.setAnnex1(this.annex1);
         initiatingDO.setAnnex2(this.annex2);
         initiatingDO.setAnnex3(this.annex3);
-        initiatingDO.setQy_year(this.signStartTime.getYear());
+        initiatingDO.setQy_year(timeUtils(this.signStartTime,"year"));
-        initiatingDO.setQy_month(this.signStartTime.getMonth());
+        initiatingDO.setQy_month(timeUtils(this.signStartTime,"month"));
-        initiatingDO.setQy_day(this.signStartTime.getDay());
+        initiatingDO.setQy_day(timeUtils(this.signStartTime,"day"));
-        initiatingDO.setJy_year(this.signEndTime.getYear());
+        initiatingDO.setJy_year(timeUtils(this.signEndTime,"year"));
-        initiatingDO.setJy_month(this.signEndTime.getMonth());
+        initiatingDO.setJy_month(timeUtils(this.signEndTime,"month"));
-        initiatingDO.setJy_day(this.signEndTime.getDay());
+        initiatingDO.setJy_day(timeUtils(this.signEndTime,"day"));
         initiatingDO.setYxjzz(this.yxjzz);
         initiatingDO.setXyqx_month(this.xyqx_month);
         initiatingDO.setJmf(this.jmf);
@@ -165,4 +167,21 @@ public class InitiatingRequest {
         initiatingDO.setJmyxjdx(this.jmyxjdx);
         return initiatingDO;
     }
+
+    private int timeUtils(Date time, String type) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        switch (type){
+            case "year":
+                return calendar.get(Calendar.YEAR);
+            case "month":
+                return calendar.get(Calendar.MONTH) + 1;
+            case "day":
+                return  calendar.get(Calendar.DAY_OF_MONTH);
+            default:
+                return 0;
+        }
+
+    }
+
 }

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

@@ -138,6 +138,11 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
             WorkflowSubStageEnum nextStage = workflowSubStageEnum.getNextStage();
             //更新线索阶段
             lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId);
+            Map<String, String> requestMap = new HashMap<>();
+            requestMap.put("partnerUsername", lineInfo.getUsername());
+            requestMap.put("lineId", String.valueOf(lineInfo.getId()));
+            requestMap.put("partnerMobile", lineInfo.getMobile());
+            commonService.sendMessage(Collections.singletonList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_32,requestMap);
         }
         //更新auditId
         SigningBaseInfoDO signingBaseInfoDO = intentAgreementMapper.selectByPartnerIdOrLineId(null, lineInfo.getId());
@@ -257,6 +262,11 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
         if (Objects.isNull(lineInfoDO)) {
             throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
         }
+        if ("1".equals(lineInfoDO.getSex())){
+            franchiseeDO.setSex(1);
+        }else if ("2".equals(lineInfoDO.getSex())){
+            franchiseeDO.setSex(0);
+        }
         HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(lineInfoDO.getWantShopAreaId());
         franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId()));
         franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId()));

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

@@ -103,6 +103,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
         lineInfoDAO.updateWorkflowStage(lineInfo.getId(), nextStage, nextStage.getInitStatus(), userId);
         //更新加盟问卷信息
         joinIntentionMapper.updateAuditIdByLineId(auditId, lineInfo.getId());
+        commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.INTERVIEW_APPOINTMENT_SUCCESS);
         return Boolean.TRUE;
     }
 

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

@@ -203,12 +203,12 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 .hkbzj(Integer.valueOf(franchiseFeeDO.getLoanMargin()))
                 .hkbzjdx(Integer.valueOf(franchiseFeeDO.getLoanMargin()))
                 .hkbzjwb(Convert.digitToChinese(Integer.valueOf(franchiseFeeDO.getLoanMargin())))
-                .ht_day(DateTime.of(request.getContractStartTime()).getDay())
+                .ht_day(timeUtils(request.getContractStartTime(),"day"))
-                .ht_day2(DateTime.of(request.getContractStartEndTime()).getDay())
+                .ht_day2(timeUtils(request.getContractStartEndTime(),"day"))
-                .ht_month1(DateTime.of(request.getContractStartTime()).getMonth())
+                .ht_month1(timeUtils(request.getContractStartTime(),"month"))
-                .ht_month2(DateTime.of(request.getContractStartEndTime()).getMonth())
+                .ht_month2(timeUtils(request.getContractStartEndTime(),",month"))
-                .ht_year1(DateTime.of(request.getContractStartTime()).getYear())
+                .ht_year1(timeUtils(request.getContractStartTime(),"year"))
-                .ht_year2(DateTime.of(request.getContractStartEndTime()).getYear())
+                .ht_year2(timeUtils(request.getContractStartEndTime(),"year"))
                 .idcard_1(Collections.singletonList(signingBaseInfoDO.getIdCardFront()))
                 .idcard_2(Collections.singletonList(signingBaseInfoDO.getIdCardReverse()))
                 .idcard_address(signingBaseInfoDO.getIdCardAddress())
@@ -225,26 +225,26 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
                 .jmf2(Integer.valueOf(franchiseFeeDO.getFirstYearFee()))
                 .jmf3(Integer.valueOf(franchiseFeeDO.getSecondYearFee()))
                 .jmf4(Integer.valueOf(franchiseFeeDO.getThirdYearFee()))
-                .jmfday1(DateTime.of(franchiseFeeDO.getFirstYearStartTime()).getDay())
+                .jmfday1(timeUtils(franchiseFeeDO.getFirstYearStartTime(),"day"))
-                .jmfday2(DateTime.of(franchiseFeeDO.getFirstYearEndTime()).getDay())
+                .jmfday2(timeUtils(franchiseFeeDO.getFirstYearEndTime(),"day"))
-                .jmfday3(DateTime.of(franchiseFeeDO.getSecondYearStartTime()).getDay())
+                .jmfday3(timeUtils(franchiseFeeDO.getSecondYearStartTime(),"day"))
-                .jmfday4(DateTime.of(franchiseFeeDO.getSecondYearEndTime()).getDay())
+                .jmfday4(timeUtils(franchiseFeeDO.getSecondYearEndTime(),"day"))
-                .jmfday5(DateTime.of(franchiseFeeDO.getThirdYearStartTime()).getDay())
+                .jmfday5(timeUtils(franchiseFeeDO.getThirdYearStartTime(),"day"))
-                .jmfday6(DateTime.of(franchiseFeeDO.getThirdYearEndTime()).getDay())
+                .jmfday6(timeUtils(franchiseFeeDO.getThirdYearEndTime(),"day"))
                 .jmfdx(Integer.valueOf(franchiseFeeDO.getYearFranchiseFee()))
-                .jmfmonth1(DateTime.of(franchiseFeeDO.getFirstYearStartTime()).getMonth())
+                .jmfmonth1(timeUtils(franchiseFeeDO.getFirstYearStartTime(),"month"))
-                .jmfmonth2(DateTime.of(franchiseFeeDO.getFirstYearEndTime()).getMonth())
+                .jmfmonth2(timeUtils(franchiseFeeDO.getFirstYearEndTime(),"month"))
-                .jmfmonth3(DateTime.of(franchiseFeeDO.getSecondYearStartTime()).getMonth())
+                .jmfmonth3(timeUtils(franchiseFeeDO.getSecondYearStartTime(),"month"))
-                .jmfmonth4(DateTime.of(franchiseFeeDO.getSecondYearEndTime()).getMonth())
+                .jmfmonth4(timeUtils(franchiseFeeDO.getSecondYearEndTime(),"month"))
-                .jmfmonth5(DateTime.of(franchiseFeeDO.getThirdYearStartTime()).getMonth())
+                .jmfmonth5(timeUtils(franchiseFeeDO.getThirdYearStartTime(),"month"))
-                .jmfmonth6(DateTime.of(franchiseFeeDO.getThirdYearEndTime()).getMonth())
+                .jmfmonth6(timeUtils(franchiseFeeDO.getThirdYearEndTime(),"month"))
                 .jmfwb(Convert.digitToChinese(Integer.valueOf(franchiseFeeDO.getYearFranchiseFee())))
-                .jmfyear1(DateTime.of(franchiseFeeDO.getFirstYearStartTime()).getYear())
+                .jmfyear1(timeUtils(franchiseFeeDO.getFirstYearStartTime(),"year"))
-                .jmfyear2(DateTime.of(franchiseFeeDO.getFirstYearEndTime()).getYear())
+                .jmfyear2(timeUtils(franchiseFeeDO.getFirstYearEndTime(),"year"))
-                .jmfyear3(DateTime.of(franchiseFeeDO.getSecondYearStartTime()).getYear())
+                .jmfyear3(timeUtils(franchiseFeeDO.getSecondYearStartTime(),"year"))
-                .jmfyear4(DateTime.of(franchiseFeeDO.getSecondYearEndTime()).getYear())
+                .jmfyear4(timeUtils(franchiseFeeDO.getSecondYearEndTime(),"year"))
-                .jmfyear5(DateTime.of(franchiseFeeDO.getThirdYearStartTime()).getYear())
+                .jmfyear5(timeUtils(franchiseFeeDO.getThirdYearStartTime(),"year"))
-                .jmfyear6(DateTime.of(franchiseFeeDO.getThirdYearEndTime()).getYear())
+                .jmfyear6(timeUtils(franchiseFeeDO.getThirdYearEndTime(),"year"))
                 .jmsdkjt(temp)
                 .jmsdm(lineInfoDO.getPartnerNum())
                 .jmshtzt(0)
@@ -425,4 +425,20 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_8);
         return true;
     }
+
+    private int timeUtils(Date time, String type) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(time);
+        switch (type){
+            case "year":
+                return calendar.get(Calendar.YEAR);
+            case "month":
+                return calendar.get(Calendar.MONTH) + 1;
+            case "day":
+                return  calendar.get(Calendar.DAY_OF_MONTH);
+            default:
+                return 0;
+        }
+
+    }
 }

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

@@ -69,14 +69,14 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
             leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode());
             lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_85.getCode());
             //message
-            Map<String, String> requestMap = new HashMap<>();
+//            Map<String, String> requestMap = new HashMap<>();
-            LineInfoDO byLineId = lineInfoMapper.getByLineId(request.getLineId());
+//            LineInfoDO byLineId = lineInfoMapper.getByLineId(request.getLineId());
-            requestMap.put("partnerUsername",byLineId.getUsername());
+//            requestMap.put("partnerUsername",byLineId.getUsername());
-            requestMap.put("partnerMobile",byLineId.getMobile());
+//            requestMap.put("partnerMobile",byLineId.getMobile());
-            requestMap.put("lineId",String.valueOf(request.getLineId()));
+//            requestMap.put("lineId",String.valueOf(request.getLineId()));
-            commonService.sendMessage(Collections.singletonList(byLineId.getInvestmentManager()),
+//            commonService.sendMessage(Collections.singletonList(byLineId.getInvestmentManager()),
-                    MessageEnum.MESSAGE_32,
+//                    MessageEnum.MESSAGE_32,
-                    requestMap);
+//                    requestMap);
         } else if (currentDate.after(request.getExperienceStartTime()) || currentDate.before(request.getExperienceEndTime())) {
             leaseBaseInfoDO.setExperienceStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90.getCode());
             lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.STORE_EXPERIENCE_90.getCode());