OA

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

@@ -5,6 +5,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 @Data
 public class IntentAgreementSubmitRequest {
 
@@ -37,6 +40,12 @@ public class IntentAgreementSubmitRequest {
     @ApiModelProperty("公司地址")
     private String businessLicenseAddress;
 
+    private BigDecimal jmf;
+
+    private Date signStartTime;
+
+    private Date signEndTime;
+
 
     public SigningBaseInfoDO toSigningBaseInfoDO() {
         SigningBaseInfoDO signingBaseInfoDO = new SigningBaseInfoDO();

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

@@ -171,6 +171,9 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
             auditPassRequest.setLineId(lineInfoDO.getId());
             auditPassRequest.setWorkflowSubStage(lineInfoDO.getWorkflowSubStage());
             commonService.getLineFlowService(lineInfoDO.getWorkflowSubStage()).auditPass(auditPassRequest, null);
+            String redisKey = "OA:" + request.getMobile() + request.getIdCardNo();
+            log.info("initiating redisKey:{},request:{}", redisKey, JSONObject.toJSONString(request));
+            redisUtilPool.setString(redisKey, JSONObject.toJSONString(request));
             // TODO: 2024/6/18 企微工作通知
 //            Map<String, String> requestMap = new HashMap<>();
 //            requestMap.put("partnerUsername", lineInfoDO.getUsername());
@@ -272,7 +275,6 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
                     lineInfoMapper.updateByPrimaryKeySelective(lineInfoParam);
                 }
                 if (initiatingResponse.getCode() != 0) {
-//                    lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_63.getCode());
                     lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);
                     return new ResponseResult(500, initiatingResponse.getMessage(), initiatingResponse.getData());
                 } else {

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

@@ -389,8 +389,6 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         LinePayDO linePayDO = linePayMapper.getByLineIdAndPayTypeAndShopId(lineId, 1, shopId);
         //铺位信息
         PointInfoDO pointInfoDO = pointInfoMapper.getDataByShopIdAndLineId(lineId, shopId);
-        //建店数据
-        SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectOne(SystemBuildingShopDO.builder().shopId(shopId).lineId(lineId).build());
         //证照办理
         LicenseTransactDO licenseTransactDO = applyLicenseMapper.selectByShopId(shopId);
         if (Objects.nonNull(signFranchiseDO)) {
@@ -412,13 +410,8 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         } else {
             addSignFranchiseResponse.setMobile(lineInfoDO.getMobile());
         }
-        if (Objects.nonNull(systemBuildingShopDO)) {
+        addSignFranchiseResponse.setStoreName(shopInfoDO.getShopName());
-            addSignFranchiseResponse.setStoreName(systemBuildingShopDO.getStoreName());
+
-            addSignFranchiseResponse.setBigRegion(systemBuildingShopDO.getBigName());
-            addSignFranchiseResponse.setBigRegionManager(systemBuildingShopDO.getRegioGeneral());
-            addSignFranchiseResponse.setFranchiseeType(Objects.requireNonNull(FranchiseeTypeEnum.getByCode(systemBuildingShopDO.getFranchiseeType())).getMessage());
-            addSignFranchiseResponse.setReasons(systemBuildingShopDO.getReasons());
-        }
         if (Objects.nonNull(pointInfoDO)) {
             addSignFranchiseResponse.setStoreAddress(pointInfoDO.getAddress());
         }