suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zhangchenbiao
2024-05-10 15:49:22 +08:00
parent ad0c1e7b4e b54baa391d
commit 666793b334
16 changed files with 121 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
coolstore-partner-common/src/main/java/com/cool/store/enums/MessageEnum.java
View File

@@ -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&timestamp="+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&timestamp="+System.currentTimeMillis()+"&lineId=" + paramMap.get("lineId"), StandardCharsets.UTF_8.name());
@@ -101,6 +100,16 @@ 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&timestamp="+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=" +
URLEncoder.encode("pages/common-web-view/index?noticeType=xfsg&routerUrl=notice&target=employeeTraining&timestamp="+System.currentTimeMillis()+"&userDetailId="+ paramMap.get("userDetailId"), StandardCharsets.UTF_8.name());
default:
return "";
}

2
coolstore-partner-dao/src/main/java/com/cool/store/dao/EmployeeTrainingDAO.java
View File

@@ -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);
}

7
coolstore-partner-dao/src/main/java/com/cool/store/dao/EnterpriseUserDAO.java
View File

@@ -95,6 +95,13 @@ public class EnterpriseUserDAO {
return enterpriseUserMapper.getUserListByRegionIds( regionIds);
}
public List<String> getUserIdListByRegionId(Long regionId, List<String> userIdList){
if(CollectionUtils.isEmpty(userIdList) || regionId == null){
return Lists.newArrayList();
}
return enterpriseUserMapper.getUserIdListByRegionId(regionId, userIdList);
}
public Map<String, String> getUserNameAndMobile(List<String> userIds){
List<EnterpriseUserDO> userList = getUserInfoByUserIds(userIds);
return userList.stream().filter(o->!StringUtils.isAnyBlank(o.getMobile())).collect(Collectors.toMap(k -> k.getUserId(), v -> v.getName() + " " + v.getMobile()));

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/EmployeeTrainingMapper.java
View File

@@ -11,7 +11,7 @@ import java.util.List;
public interface EmployeeTrainingMapper extends Mapper<EmployeeTrainingDO> {
List<EmployeeTrainingVO> employeeTrainingMapper(@Param("keyWord") String keyWord, @Param("regionIdList") List<String> regionIdList,
List<EmployeeTrainingVO> employeeTrainingList(@Param("keyWord") String keyWord, @Param("regionIdList") List<String> regionIdList,
@Param("authRegionIdList") List<String> authRegionIdList, @Param("assignFlag") Boolean assignFlag,
@Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("storeNumList") List<String> storeNumList,
@Param("theoreticalExamStatus") Integer theoreticalExamStatus,

6
coolstore-partner-dao/src/main/java/com/cool/store/mapper/EnterpriseUserMapper.java
View File

@@ -77,4 +77,10 @@ public interface EnterpriseUserMapper {
* @description: 根据userid查询名字
*/
List<UserNameDTO> selectNameByUserId(@Param("userIdList") List<String> userId);
/**
* 获取部门人员
* @return
*/
List<String> getUserIdListByRegionId( @Param("regionId") Long regionId, @Param("userIdList") List<String> userId);
}

2
coolstore-partner-dao/src/main/resources/mapper/EmployeeTrainingMapper.xml
View File

@@ -28,7 +28,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="deleted" jdbcType="BIT" property="deleted"/>
</resultMap>
<select id="employeeTrainingMapper" resultType="com.cool.store.vo.EmployeeTrainingVO">
<select id="employeeTrainingList" resultType="com.cool.store.vo.EmployeeTrainingVO">
select
u.id,
u.username,

9
coolstore-partner-dao/src/main/resources/mapper/EnterpriseUserMapper.xml
View File

@@ -152,6 +152,15 @@
</foreach>
</select>
<select id="getUserIdListByRegionId" resultType="java.lang.String">
select user_id as userId
from enterprise_user_${enterpriseId}
where user_id in
<foreach item="userId" index="index" collection="userIdList" open="(" separator="," close=")">
#{userId}
</foreach>
and user_region_ids like concat('%', #{regionId}, '%')
</select>
</mapper>

2
coolstore-partner-service/src/main/java/com/cool/store/service/EmployeeTrainingService.java
View File

@@ -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);

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java
View File

@@ -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);
//插入操作/意见

19
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EmployeeTrainingServiceImpl.java
View File

@@ -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

23
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FranchiseFeeServiceImpl.java
View File

@@ -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);

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

@@ -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) {

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -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);
}

10
coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java
View File

@@ -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);
//更新阶段状态

25
coolstore-partner-service/src/main/java/com/cool/store/service/impl/TempUserDetailServiceImpl.java
View File

@@ -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

12
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/EmployeeTrainingController.java
View File

@@ -70,12 +70,16 @@ public class EmployeeTrainingController {
@ApiOperation("培训-教练员-员工列表")
@PostMapping("/trainerUserList")
@GetMapping("/trainerUserList")
@ApiImplicitParams({
@ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成")
@ApiImplicitParam(name = "status", value = "带训状态 0-未完成 1-已完成"),
@ApiImplicitParam(name = "pageNum", value = "分页页数"),
@ApiImplicitParam(name = "pageSize", value = "分页大小"),
})
public ResponseResult<List<EmployeeTrainingVO>> trainerUserList(@RequestParam(value = "status", required = false) Integer status) {
return ResponseResult.success(employeeTrainingService.trainerUserList(CurrentUserHolder.getUserId(), status));
public ResponseResult<PageInfo<EmployeeTrainingVO>> 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("培训-教练员-员工带训详情")