From 658661d4091aed5ea8a3e7042bc9a12cf0376db5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 19 Jun 2024 19:05:51 +0800 Subject: [PATCH] OA --- .../store/request/IntentAgreementSubmitRequest.java | 9 +++++++++ .../service/impl/IntentAgreementServiceImpl.java | 4 +++- .../store/service/impl/SignFranchiseServiceImpl.java | 11 ++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAgreementSubmitRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAgreementSubmitRequest.java index 0d6192463..55897840f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/IntentAgreementSubmitRequest.java +++ b/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(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index e84be1482..56b99fff2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/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 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 { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 7606f9318..deb56ff47 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/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(systemBuildingShopDO.getStoreName()); - addSignFranchiseResponse.setBigRegion(systemBuildingShopDO.getBigName()); - addSignFranchiseResponse.setBigRegionManager(systemBuildingShopDO.getRegioGeneral()); - addSignFranchiseResponse.setFranchiseeType(Objects.requireNonNull(FranchiseeTypeEnum.getByCode(systemBuildingShopDO.getFranchiseeType())).getMessage()); - addSignFranchiseResponse.setReasons(systemBuildingShopDO.getReasons()); - } + addSignFranchiseResponse.setStoreName(shopInfoDO.getShopName()); + if (Objects.nonNull(pointInfoDO)) { addSignFranchiseResponse.setStoreAddress(pointInfoDO.getAddress()); }