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 b7d70d698..e7b1186cc 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 @@ -78,7 +78,7 @@ public class EmployeeTrainingDAO { public Integer unCompleteNum(Long shopId) { Example example = new Example(EmployeeTrainingDO.class); - example.createCriteria().andEqualTo("shopId", shopId).andCondition("(theoretical_exam_status != 1 or practical_exam_status != 1)"); + example.createCriteria().andEqualTo("shopId", shopId).andCondition("(practical_exam_status != 1)"); return employeeTrainingMapper.selectCountByExample(example); } } 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 74d69306b..cfa0a9869 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 @@ -158,7 +158,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { log.info("未找到可发送工作通知的人员"); return true; } - commonService.sendMessage(sendUsers, MessageEnum.MESSAGE_17, requestMap); + //commonService.sendMessage(sendUsers, MessageEnum.MESSAGE_17, requestMap); } return true; } @@ -203,22 +203,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { submitLicenseResponse.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); } } - //2.未查到证照信息，所以查询鲜丰的默认值(只要鲜丰接口内有值，总是优先使用鲜丰数据) - if (Objects.nonNull(shopInfoDO.getStoreNum()) && StringUtil.isNotBlank(shopInfoDO.getStoreNum())) { - GetStoreInfoByCodeResponse storeInfoCode = coolStoreStartFlowService.getStoreInfoCode(shopInfoDO.getStoreNum()); - if (Objects.nonNull(storeInfoCode.getData()) - && Objects.nonNull(storeInfoCode.getData().getStoreDocument()) - && storeInfoCode.getCode() == 0 - && StringUtil.isNotBlank(storeInfoCode.getData().getStoreDocument().getStoreBusinessNumber())) { - //替换落库的值 - submitLicenseResponse = SubmitLicenseResponse.from(storeInfoCode, submitLicenseResponse); - //给前端判断哪些是鲜丰数据不可修改 - GetStoreInfoByCodeResponse.StoreDocument storeDocument = storeInfoCode.getData().getStoreDocument(); - SubmitLicenseResponse.StoreDocument storeDocumentResponse = toStoreDocument(storeDocument); - submitLicenseResponse.setStoreDocument(storeDocumentResponse); - return submitLicenseResponse; - } - } + //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写 return submitLicenseResponse; 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 58287a752..c44527d9f 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 @@ -194,21 +194,6 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { employeeTrainingVO.setAssessmentStatus(employeeTrainingDO.getAssessmentStatus()); employeeTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum()); employeeTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum()); - employeeTrainingVO.setTheoreticalExamStatus(employeeTrainingDO.getTheoreticalExamStatus()); - employeeTrainingVO.setTheoreticalExamScore(employeeTrainingDO.getTheoreticalExamScore()); - //查询理论分支并更新 - StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); - if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) - && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - employeeTrainingVO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); - employeeTrainingVO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); - if(!employeeTrainingVO.getTheoreticalExamScore().equals(employeeTrainingDO.getTheoreticalExamScore()) - || !employeeTrainingVO.getTheoreticalExamStatus().equals(employeeTrainingDO.getTheoreticalExamStatus())){ - employeeTrainingDO.setTheoreticalExamScore(employeeTrainingVO.getTheoreticalExamScore()); - employeeTrainingDO.setTheoreticalExamStatus(employeeTrainingVO.getTheoreticalExamStatus()); - employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO); - } - } employeeTrainingVO.setPracticalExamStatus(employeeTrainingDO.getPracticalExamStatus()); employeeTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore()); employeeTrainingVO.setEstimatedAssessmentTime(employeeTrainingDO.getEstimatedAssessmentTime()); @@ -495,22 +480,7 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { assessmentUserTrainingVO.setUsername(tempUserDetailDO.getUsername()); assessmentUserTrainingVO.setAssessmentStatus(employeeTrainingDO.getAssessmentStatus()); assessmentUserTrainingVO.setShopId(tempUserDetailDO.getShopId()); - assessmentUserTrainingVO.setTheoreticalExamStatus(employeeTrainingDO.getTheoreticalExamStatus()); - assessmentUserTrainingVO.setTheoreticalExamScore(employeeTrainingDO.getTheoreticalExamScore()); - //查询理论分支并更新 - StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); - if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) - && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - assessmentUserTrainingVO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); - assessmentUserTrainingVO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); - if(!assessmentUserTrainingVO.getTheoreticalExamScore().equals(employeeTrainingDO.getTheoreticalExamScore()) - || !assessmentUserTrainingVO.getTheoreticalExamStatus().equals(employeeTrainingDO.getTheoreticalExamStatus())){ - employeeTrainingDO.setTheoreticalExamScore(assessmentUserTrainingVO.getTheoreticalExamScore()); - employeeTrainingDO.setTheoreticalExamStatus(assessmentUserTrainingVO.getTheoreticalExamStatus()); - employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO); - } - } assessmentUserTrainingVO.setAssessmentNum(employeeTrainingDO.getAssessmentNum()); assessmentUserTrainingVO.setAssessmentTotalNum(employeeTrainingDO.getAssessmentTotalNum()); assessmentUserTrainingVO.setPracticalExamScore(employeeTrainingDO.getPracticalExamScore()); @@ -588,7 +558,6 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { EmployeeTrainingDO employeeTrainingDO = employeeTrainingDAO.selectById(request.getEmployeeTrainingId()); TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(employeeTrainingDO.getXfsgUserDetailId()); ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailDO.getShopId()); - Boolean pass = true; EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard()); String userId = enterpriseUserDO.getUserId(); AtomicReference totalScore = new AtomicReference<>(0L); @@ -640,16 +609,6 @@ public class EmployeeTrainingServiceImpl implements EmployeeTrainingService { employeeTrainingDO.setPracticalExamScore(totalScore.get().intValue()); employeeTrainingDO.setActualAssessmentTime(new Date()); - if(employeeTrainingDO.getTheoreticalExamScore() == null){ - //查询理论分支并更新 - StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); - if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) - && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - employeeTrainingDO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); - employeeTrainingDO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); - } - } - if (employeeTrainingDO.getPracticalExamStatus() == CommonConstants.TWO) { employeeTrainingDO.setAssessmentStatus(CommonConstants.THREE); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java index c6385238b..c0798dbf9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LinePayServiceImpl.java @@ -104,16 +104,16 @@ public class LinePayServiceImpl implements LinePayService { requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); requestMap.put("shopId",String.valueOf(shopInfoDO.getId())); - commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_18,requestMap); + //commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_18,requestMap); } if (PayBusinessTypeEnum.INTENT_MONEY.getCode().equals(request.getPayBusinessType())) { lineInfo.setWorkflowSubStage(WorkflowSubStageEnum.PAY_DEPOSIT.getCode()); lineInfo.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.PAY_DEPOSIT_50.getCode()); lineInfoDAO.insertOrUpdate(lineInfo); Map requestMap = new HashMap<>(); -// requestMap.put("partnerUsername",lineInfo.getUsername()); -// requestMap.put("payTime",DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, linePayDO.getPayTime())); -// requestMap.put("lineId",String.valueOf(lineInfo.getId())); + requestMap.put("partnerUsername",lineInfo.getUsername()); + requestMap.put("payTime",DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, linePayDO.getPayTime())); + requestMap.put("lineId",String.valueOf(lineInfo.getId())); // commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()), MessageEnum.MESSAGE_5,requestMap); } return payId == null ? null : payId; 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 ce55cf0b7..7606f9318 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 @@ -163,13 +163,14 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu FranchiseAgreementRequest franchiseAgreementRequest = convertFranchiseAgreement(request, shopInfoDO, user); MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(shopInfoDO.getLineId()); log.info("submitSignFranchise franchiseAgreementRequest :{}", JSONObject.toJSONString(franchiseAgreementRequest)); - ResponseResult responseResult = coolStoreStartFlowService.franchiseAgreement(franchiseAgreementRequest, memberQuestionDO.getJoinType()); //更新状态为加盟商 LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(shopInfoDO.getLineId()); - lineInfoDO.setJoinStatus(2); + //暂时去掉 + //lineInfoDO.setJoinStatus(2); lineInfoMapper.insertOrUpdate(lineInfoDO); - shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_83); - return responseResult; + //todo 提交之后先直接到已签约 正常是待审核 + shopStageInfoDAO.updateShopStageInfo(request.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84); + return new ResponseResult(200000,"提交成功"); } else { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } 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 be4bb43ac..75ff4852d 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 @@ -100,17 +100,10 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { if(tempUserDetailDO != null){ throw new ServiceException("该员工已登记"); } - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailRequest.getIdCard()); - if(enterpriseUserDO == null){ - throw new ServiceException("用户不存在"); - } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfo(tempUserDetailRequest.getShopId()); if(shopInfoDO == null){ throw new ServiceException("该店铺不存在"); } -// if(StringUtil.isNotBlank(shopInfoDO.getStoreNum())){ -// throw new ServiceException("系统建店已完成，无法手动登记"); -// } tempUserDetailDO = new TempUserDetailDO(); tempUserDetailDO.setLineId(shopInfoDO.getLineId()); tempUserDetailDO.setShopId(tempUserDetailRequest.getShopId()); @@ -137,19 +130,19 @@ public class TempUserDetailServiceImpl implements TempUserDetailService { shopStageInfoDAO.updateShopStageInfo(tempUserDetailDO.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_60); } - List userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode())); - RegionDO regionDO = regionDao.getRegionById(shopInfoDO.getRegionId()); - // - if (regionDO != null && regionDO.getParentId() != null){ - userIdList = enterpriseUserDAO.getUserIdListByRegionId(Long.valueOf(regionDO.getParentId()), 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); - } +// List userIdList = enterpriseUserRoleDao.getUserIdsByRoleIdList(Collections.singletonList(UserRoleEnum.TRAINER.getCode())); +// RegionDO regionDO = regionDao.getRegionById(shopInfoDO.getRegionId()); +// // +// if (regionDO != null && regionDO.getParentId() != null){ +// userIdList = enterpriseUserDAO.getUserIdListByRegionId(Long.valueOf(regionDO.getParentId()), 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/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 89379c31c..35673ad23 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -391,30 +391,6 @@ public class XxlJobHandler { XxlJobHelper.handleSuccess(); } - @XxlJob("theoreticalExam") - public void theoreticalExam() { - log.info("------理论考试更新------"); - List theoreticalList = employeeTrainingDAO.theoreticalList(); - if (CollectionUtils.isEmpty(theoreticalList)) { - log.info("------今日没有待更新数据------"); - return; - } - for (EmployeeTrainingDO employeeTrainingDO : theoreticalList) { - TempUserDetailDO tempUserDetailDO = tempUserDetailDAO.selectById(employeeTrainingDO.getXfsgUserDetailId()); - - EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoByThirdOaUniqueFlag(tempUserDetailDO.getIdCard()); - //查询理论分支并更新 - StaffExamInfoDTO staffExamInfoDTO = xfsgEhrService.getUserExamInfo(enterpriseUserDO.getJobnumber()); - if (staffExamInfoDTO != null && StringUtils.isNotBlank(staffExamInfoDTO.getExamResult()) - && StringUtils.isNotBlank(staffExamInfoDTO.getExamScore())) { - employeeTrainingDO.setTheoreticalExamScore(StringUtils.isNotBlank(staffExamInfoDTO.getExamScore()) ? NumberConverter.convertMath(staffExamInfoDTO.getExamScore()) : null); - employeeTrainingDO.setTheoreticalExamStatus(ExamStatusEnum.matchCodeByDesc(staffExamInfoDTO.getExamResult())); - employeeTrainingDAO.updateByPrimaryKeySelective(employeeTrainingDO); - } - - } - XxlJobHelper.handleSuccess(); - } /** * 店铺新店开业状态更新