diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java index a898f4553..86cc237aa 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java @@ -78,16 +78,15 @@ public enum MessageEnum { switch (this) { case MESSAGE_1: case MESSAGE_2: + case MESSAGE_3: case MESSAGE_4: case MESSAGE_5: case MESSAGE_6: case MESSAGE_7: case MESSAGE_8: case MESSAGE_9: - case MESSAGE_15: return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId="+ corpId + "&appUrl=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=clue×tamp="+System.currentTimeMillis()+"&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); - case MESSAGE_3: case MESSAGE_10: return domainUrl + "/dd-noticemsg?appId=" + appId + "&corpId="+ corpId + "&appUrl=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=interview×tamp="+System.currentTimeMillis()+"&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name()); @@ -101,6 +100,12 @@ public enum MessageEnum { case MESSAGE_14: return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=pointPush×tamp="+System.currentTimeMillis()+"&lineId="+ paramMap.get("lineId"), StandardCharsets.UTF_8.name()); + case MESSAGE_15: + case MESSAGE_16: + case MESSAGE_17: + case MESSAGE_18: + case MESSAGE_19: + case MESSAGE_20: case MESSAGE_21: case MESSAGE_22: return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 6dd09d115..dc1dc4cc3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -9,6 +9,7 @@ import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.AuditTypeEnum; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; @@ -78,6 +79,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Resource UserRegionMappingMapper userRegionMappingMapper; + @Resource + CommonService commonService; + + @Resource + LineInfoMapper lineInfoMapper; + @Override @Transactional(rollbackFor = Exception.class) public Boolean submitLicense(SubmitLicenseRequest request, PartnerUserInfoVO user) { @@ -218,6 +225,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { shopAuditInfoDO.setRejectReason(result); shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_42; licenseTransactDO.setDeleted(Constants.ONE_INTEGER); + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); + LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.LICENSE_NOT_PASS); } applyLicenseMapper.updateByShopId(licenseTransactDO); //插入操作/意见 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java index aba4e6db9..81e6ad793 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java @@ -4,16 +4,11 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.ShopStageInfoDAO; -import com.cool.store.entity.FranchiseFeeDO; -import com.cool.store.entity.LineInfoDO; -import com.cool.store.entity.LinePayDO; -import com.cool.store.entity.ShopAuditInfoDO; +import com.cool.store.entity.*; import com.cool.store.enums.AuditTypeEnum; +import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; -import com.cool.store.mapper.FranchiseFeeMapper; -import com.cool.store.mapper.LineInfoMapper; -import com.cool.store.mapper.LinePayMapper; -import com.cool.store.mapper.ShopAuditInfoMapper; +import com.cool.store.mapper.*; import com.cool.store.request.AuditFranchiseFeeRequest; import com.cool.store.request.FranchiseFeeRequest; import com.cool.store.response.FranchiseFeeResponse; @@ -46,6 +41,12 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { @Resource LineInfoMapper lineInfoMapper; + @Resource + ShopInfoMapper shopInfoMapper; + + @Resource + CommonService commonService; + @Override @Transactional(rollbackFor = Exception.class) public Boolean submitLicense(FranchiseFeeRequest request) { @@ -58,6 +59,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { } else { franchiseFeeMapper.insertSelective(franchiseFeeDO); } + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); + LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.FRANCHISE_FEE_SUBMITTED); return true; } @@ -99,6 +103,9 @@ public class FranchiseFeeServiceImpl implements FranchiseFeeService { } else if (request.getStatus() == Constants.ONE_INTEGER) { shopAuditInfoDO.setRejectReason(request.getResult()); shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_74; + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(request.getShopId()); + LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + commonService.sendSms(lineInfoDO.getMobile(),SMSMsgEnum.FRANCHISE_FEE_NOT_PASS); } //插入audit shopAuditInfoMapper.insertSelective(shopAuditInfoDO); 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 f911acd79..20eebdb89 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 @@ -184,6 +184,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten initiatingDO.setApply_user("22090043"); initiatingDO.setApply_user_name("22090043"); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); + initiatingDO.setJmsxx(lineInfoDO.getPartnerNum()); initiatingDO.setKdzBusinessId(AuditEnum.CONTRACT_INTENTION.getCode() + "_" + lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus()); InitiatingResponse initiatingResponse = httpRestTemplateService.postForObject(url, initiatingDO, InitiatingResponse.class); if (initiatingResponse.getCode() != 0L) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index f38ea8575..7a698c26f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -936,9 +936,9 @@ public class PointServiceImpl implements PointService { throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); } Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22; if(AuditResultTypeEnum.REJECT.getCode().equals(request.getResultType())){ - LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, null); } if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23.equals(subStageStatus)){ @@ -954,6 +954,12 @@ public class PointServiceImpl implements PointService { List roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER); updateShop.setShopManagerUserId(sysRoleService.getUserIdByRegionIdWithRolePriority(shopInfo.getRegionId(), roleList)); shopInfoDAO.updateShopInfo(updateShop); + //发送验证码 + commonService.sendSms(lineInfo.getMobile(),SMSMsgEnum.LICENSE_SUBMITTED); + //发送工作通知 + Map requestMap = new HashMap<>(); + //todo requestMap参数 + commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); } return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index 86a5131bf..f040a64bf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -6,10 +6,7 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.*; -import com.cool.store.enums.AuditEnum; -import com.cool.store.enums.AuditTypeEnum; -import com.cool.store.enums.ErrorCodeEnum; -import com.cool.store.enums.UserRoleEnum; +import com.cool.store.enums.*; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.enums.prepare.newStore.BusinessDistrictEnum; import com.cool.store.enums.prepare.newStore.OfflineCompetitorEnum; @@ -76,6 +73,9 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer @Resource ShopStageInfoDAO shopStageInfoDAO; + @Resource + CommonService commonService; + @Override @Transactional(rollbackFor = Exception.class) public ResponseResult submitSysBuildStore(SysStoreAppRequest request,LoginUserInfo user) { @@ -425,6 +425,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_33; //校验建店与加盟签约合同是否完成 并初始化后续流程数据 preparationService.contractAndBuildStoreCompletion(shopId); + LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); + commonService.sendSms(lineInfoDO.getMobile(), SMSMsgEnum.SYS_BUILD_STORE_DONE); } shopAuditInfoMapper.insertSelective(shopAuditInfoDO); //更新阶段状态