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

2024-05-10 15:49:22 +08:00
parent ad0c1e7b4e b54baa391d
commit 666793b334
16 changed files with 121 additions and 30 deletions
--- 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<EmployeeTrainingVO> trainingListByShopId(Long shopId);

-    List<EmployeeTrainingVO> trainerUserList(String userId, Integer status);
+    PageInfo<EmployeeTrainingVO> trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize);

    EmployeeUserTrainingVO trainerUserDetail(Long id);

--- 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);
        //插入操作/意见
--- 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<EmployeeTrainingVO> employeeTrainingList(String userId, EmployeeTrainingRequest request) {
        List<String> authRegionIdList = new ArrayList<>();
@@ -246,6 +250,14 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService {
            assessmentDataDOList.add(assessmentDataDO);
        });
        assessmentDataDAO.batchInsertDO(assessmentDataDOList);
+
+
+        Map<String, String> 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<EmployeeTrainingVO> trainerUserList(String userId, Integer status) {
+    public PageInfo<EmployeeTrainingVO> trainerUserList(String userId, Integer status, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
        List<EmployeeTrainingVO> list = employeeTrainingDAO.trainingListByShopId(null, userId, status);
        if (CollectionUtils.isEmpty(list)) {
-            return list;
+            return new PageInfo<>();
        }
        List<String> storeIdList = list.stream().map(EmployeeTrainingVO::getTrainingStoreId).collect(Collectors.toList());
        List<StoreDO> 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
--- 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);
--- 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) {
--- 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<UserRoleEnum> 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<String, String> requestMap = new HashMap<>();
+            //todo requestMap参数
+            commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
        }
        return shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, subStageStatus, auditId);
    }
--- 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);
            //更新阶段状态
--- 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<TempUserDetailDO> tempUserDetailDOList = tempUserDetailDAO.userList(shopId);
@@ -120,6 +126,17 @@ public class TempUserDetailServiceImpl implements TempUserDetailService {
        tempUserDetailDO.setSubmitTime(new Date());
        tempUserDetailDO.setSource("create");
        tempUserDetailDAO.insertSelective(tempUserDetailDO);
+
+        List<String> userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode()));
+        //
+        userIdList = enterpriseUserDAO.getUserIdListByRegionId(shopInfoDO.getRegionId(), userIdList);
+
+        Map<String, String> 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