From 01dde13901ff8bef77df53c1b402111e62659736 Mon Sep 17 00:00:00 2001 From: bianyadong Date: Fri, 10 May 2024 15:00:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/enums/MessageEnum.java | 4 +++ .../cool/store/dao/EmployeeTrainingDAO.java | 2 +- .../com/cool/store/dao/EnterpriseUserDAO.java | 7 ++++++ .../store/mapper/EmployeeTrainingMapper.java | 2 +- .../store/mapper/EnterpriseUserMapper.java | 6 +++++ .../mapper/EmployeeTrainingMapper.xml | 2 +- .../resources/mapper/EnterpriseUserMapper.xml | 9 +++++++ .../service/EmployeeTrainingService.java | 2 +- .../impl/EmployeeTrainingServiceImpl.java | 19 +++++++++++--- .../impl/TempUserDetailServiceImpl.java | 25 ++++++++++++++++--- .../webb/EmployeeTrainingController.java | 10 +++++--- 11 files changed, 74 insertions(+), 14 deletions(-) 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 d9e568b21..a898f4553 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 @@ -101,6 +101,10 @@ 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_21: + case MESSAGE_22: + return "dingtalk://dingtalkclient/action/open_micro_app?appId="+appId+"&corpId="+corpId+"&page=" + + URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining×tamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name()); default: return ""; } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java index 1244648b8..1515e0f93 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java @@ -32,7 +32,7 @@ public class EmployeeTrainingDAO { Integer assessmentStatus, Boolean assignStoreFlag) { - return employeeTrainingMapper.employeeTrainingMapper(keyWord, regionIdList, authRegionIdList, assignFlag, beginTime, endTime, storeNumList, + return employeeTrainingMapper.employeeTrainingList(keyWord, regionIdList, authRegionIdList, assignFlag, beginTime, endTime, storeNumList, theoreticalExamStatus, practicalExamStatus, assessmentStatus, assignStoreFlag); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java index 17fc37b04..48488b85f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java @@ -95,6 +95,13 @@ public class EnterpriseUserDAO { return enterpriseUserMapper.getUserListByRegionIds( regionIds); } + public List getUserIdListByRegionId(Long regionId, List userIdList){ + if(CollectionUtils.isEmpty(userIdList) || regionId == null){ + return Lists.newArrayList(); + } + return enterpriseUserMapper.getUserIdListByRegionId(regionId, userIdList); + } + public Map getUserNameAndMobile(List userIds){ List userList = getUserInfoByUserIds(userIds); return userList.stream().filter(o->!StringUtils.isAnyBlank(o.getMobile())).collect(Collectors.toMap(k -> k.getUserId(), v -> v.getName() + " " + v.getMobile())); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EmployeeTrainingMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EmployeeTrainingMapper.java index 4e890d782..c4fc6624c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EmployeeTrainingMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EmployeeTrainingMapper.java @@ -11,7 +11,7 @@ import java.util.List; public interface EmployeeTrainingMapper extends Mapper { - List employeeTrainingMapper(@Param("keyWord") String keyWord, @Param("regionIdList") List regionIdList, + List employeeTrainingList(@Param("keyWord") String keyWord, @Param("regionIdList") List regionIdList, @Param("authRegionIdList") List authRegionIdList, @Param("assignFlag") Boolean assignFlag, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("storeNumList") List storeNumList, @Param("theoreticalExamStatus") Integer theoreticalExamStatus, diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java index 8af158da8..2fda9754d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java @@ -77,4 +77,10 @@ public interface EnterpriseUserMapper { * @description: 根据userid查询名字 */ List selectNameByUserId(@Param("userIdList") List userId); + + /** + * 获取部门人员 + * @return + */ + List getUserIdListByRegionId( @Param("regionId") Long regionId, @Param("userIdList") List userId); } \ No newline at end of file diff --git a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml index 3c859a445..af3eabf93 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml @@ -28,7 +28,7 @@ - select u.id, u.username, diff --git a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml index 0a45e4285..326cd973a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml @@ -152,6 +152,15 @@ + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java index 42784f2b6..392b64d0d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java @@ -23,7 +23,7 @@ public interface EmployeeTrainingService { List trainingListByShopId(Long shopId); - List trainerUserList(String userId, Integer status); + PageInfo trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize); EmployeeUserTrainingVO trainerUserDetail(Long id); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java index fbae23f81..b4cfc6cb3 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java @@ -11,6 +11,7 @@ import com.cool.store.dto.openPreparation.PlanLineDTO; import com.cool.store.entity.*; import com.cool.store.enums.AssessmentTemplateType; import com.cool.store.enums.ExamStatusEnum; +import com.cool.store.enums.MessageEnum; import com.cool.store.enums.video.ResourceStatusEnum; import com.cool.store.enums.video.UploadTypeEnum; import com.cool.store.exception.ServiceException; @@ -83,6 +84,9 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { @Resource private LineInfoDAO lineInfoDAO; + @Resource + private CommonService commonService; + @Override public PageInfo employeeTrainingList(String userId, EmployeeTrainingRequest request) { List authRegionIdList = new ArrayList<>(); @@ -246,6 +250,14 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { assessmentDataDOList.add(assessmentDataDO); }); assessmentDataDAO.batchInsertDO(assessmentDataDOList); + + + Map messageMap = new HashMap<>(); + messageMap.put("userName", tempUserDetailDO.getUsername()); + messageMap.put("mobile", tempUserDetailDO.getMobile()); + messageMap.put("registerTime", DateUtils.dateTime(tempUserDetailDO.getRegisterTime())); + messageMap.put("userDetailId", tempUserDetailDO.getId().toString()); + commonService.sendMessage(Collections.singletonList(employeeTrainingDO.getTrainingTeacherUserId()), MessageEnum.MESSAGE_22, messageMap); } @Override @@ -274,10 +286,11 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { } @Override - public List trainerUserList(String userId, Integer status) { + public PageInfo trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize) { + PageHelper.startPage(pageNum, pageSize); List list = employeeTrainingDAO.trainingListByShopId(null, userId, status); if (CollectionUtils.isEmpty(list)) { - return list; + return new PageInfo<>(); } List storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList()); List storeDOList = storeDAO.getEffectiveStoreByStoreIds(storeIdList); @@ -290,7 +303,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { item.setTrainingStoreName(storeNameMap.get(item.getTrainingStoreId())); item.setRegionNodeName(regionNameMap.get(item.getRegionId())); }); - return list; + return new PageInfo<>(list); } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java index d3d78d689..f63718f78 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java @@ -1,15 +1,14 @@ package com.cool.store.service.impl; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.ShopInfoDAO; -import com.cool.store.dao.ShopStageInfoDAO; -import com.cool.store.dao.TempUserDetailDAO; +import com.cool.store.dao.*; import com.cool.store.dto.ehr.StaffBaseInfoDTO; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.ShopInfoDO; import com.cool.store.entity.ShopStageInfoDO; import com.cool.store.entity.TempUserDetailDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.MessageEnum; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; @@ -17,6 +16,7 @@ import com.cool.store.request.TempUserDetailRequest; import com.cool.store.service.TempUserDetailService; import com.cool.store.service.XfsgEhrService; import com.cool.store.utils.StringUtil; +import com.cool.store.utils.poi.DateUtils; import com.cool.store.vo.TempUserDetailInfoVO; import com.cool.store.vo.TempUserDetailListVO; import com.cool.store.vo.TempUserDetailVO; @@ -49,6 +49,12 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { @Autowired private ShopStageInfoDAO shopStageInfoDAO; + @Autowired + private CommonService commonService; + + @Autowired + private EnterpriseUserRoleDao enterpriseUserRoleDao; + @Override public TempUserDetailListVO userList(Long shopId) { List tempUserDetailDOList = tempUserDetailDAO.userList(shopId); @@ -120,6 +126,17 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { tempUserDetailDO.setSubmitTime(new Date()); tempUserDetailDO.setSource("create"); tempUserDetailDAO.insertSelective(tempUserDetailDO); + + List userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode())); + // + userIdList = enterpriseUserDAO.getUserIdListByRegionId(shopInfoDO.getRegionId(), userIdList); + + Map messageMap = new HashMap<>(); + messageMap.put("userName", tempUserDetailRequest.getName()); + messageMap.put("mobile", tempUserDetailRequest.getPhone()); + messageMap.put("registerTime", DateUtils.dateTime(tempUserDetailRequest.getRegisterTime())); + messageMap.put("userDetailId", tempUserDetailDO.getId().toString()); + commonService.sendMessage(userIdList, MessageEnum.MESSAGE_21, messageMap); } @Override diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java index 613da30a0..618aa275e 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java @@ -72,10 +72,14 @@ public class EmployeeTrainingController { @ApiOperation("培训-教练员-员工列表") @PostMapping("/trainerUserList") @ApiImplicitParams({ - @ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成") + @ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成"), + @ApiImplicitParam(name = "pageNum", value = "分页页数"), + @ApiImplicitParam(name = "pageSize", value = "分页大小"), }) - public ResponseResult> trainerUserList(@RequestParam(value = "status", required = false) Integer status) { - return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status)); + public ResponseResult> trainerUserList(@RequestParam(value = "status", required = false) Integer status, + @RequestParam(value = "pageNum" ,defaultValue = "1")Integer pageNum, + @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) { + return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status, pageNum, pageSize)); } @ApiOperation("培训-教练员-员工带训详情") From 50f8ab60c645648faafe1c43e0c5bfdcafed370b Mon Sep 17 00:00:00 2001 From: bianyadong Date: Fri, 10 May 2024 15:04:18 +0800 Subject: [PATCH 2/3] get --- .../cool/store/controller/webb/EmployeeTrainingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java index 618aa275e..0c755a121 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java @@ -70,7 +70,7 @@ public class EmployeeTrainingController { @ApiOperation("培训-教练员-员工列表") - @PostMapping("/trainerUserList") + @GetMapping("/trainerUserList") @ApiImplicitParams({ @ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成"), @ApiImplicitParam(name = "pageNum", value = "分页页数"), From b54baa391d97eb8c2bd16456c5cc997ae927f7f1 Mon Sep 17 00:00:00 2001 From: guohb Date: Fri, 10 May 2024 15:34:59 +0800 Subject: [PATCH 3/3] sms & message --- .../com/cool/store/enums/MessageEnum.java | 9 ++++++-- .../service/impl/ApplyLicenseServiceImpl.java | 10 ++++++++ .../service/impl/FranchiseFeeServiceImpl.java | 23 ++++++++++++------- .../impl/IntentAgreementServiceImpl.java | 1 + .../store/service/impl/PointServiceImpl.java | 8 ++++++- .../service/impl/SysStoreAppServiceImpl.java | 10 ++++---- 6 files changed, 46 insertions(+), 15 deletions(-) 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); //更新阶段状态