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 7b4ca4bdf..aa5aa3496 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 @@ -206,9 +206,8 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten fillSignatureInfo(requestMap); String url = xfsgUrl + Constants.INTENTION_CONTRACT_URL + "?timestamp=" + requestMap.get("timestamp") + "&signature=" + requestMap.get("signature"); InitiatingDO initiatingDO = request.toInitiatingDO(); - //todo 暂时写死，后续用UserHolder - initiatingDO.setApply_user("22090043"); - initiatingDO.setApply_user_name("22090043"); + initiatingDO.setApply_user(user.getJobNumber()); + initiatingDO.setApply_user_name(user.getName()); LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(request.getLineId()); initiatingDO.setJmsxx(lineInfoDO.getPartnerNum()); initiatingDO.setKdzBusinessId(AuditEnum.CONTRACT_INTENTION.getCode() + "_" + lineInfoDO.getId() + "_" + lineInfoDO.getWorkflowSubStageStatus()); @@ -281,8 +280,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten HyOpenAreaInfoDO openAreaInfoDO = openAreaInfoMapper.selectById(lineInfoDO.getWantShopAreaId()); franchiseeDO.setProvinceCode(String.valueOf(openAreaInfoDO.getParentId())); franchiseeDO.setCityCode(String.valueOf(openAreaInfoDO.getId())); - //todo 操作人工号 暂时写死 - franchiseeDO.setOperator("22090043"); + franchiseeDO.setOperator(user.getJobNumber()); MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfoDO.getId()); //如果是企业加盟，需要传有效期和法人 if (Objects.nonNull(memberQuestionDO) && Constants.TWO_INTEGER.equals(memberQuestionDO.getJoinType())){ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 86413dff1..07a39a9cb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -77,7 +77,6 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt EnterpriseUserDO userByRoleNameAndAreaId = userAuthMappingService.getUserByRoleEnumAndWantShopAreaId(UserRoleEnum.INVESTMENT_COMMISSIONER, Long.valueOf(request.getAreaCode())); lineInfoParam.setInvestmentManager(userByRoleNameAndAreaId.getUserId()); } - //todo 目前写死为进入私海 lineInfoParam.setLineStatus(1); if (lineInfoParam.getWantShopAreaId() != null) { Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java index 49c15cb63..0dd011da8 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java @@ -487,8 +487,6 @@ public class LineInterviewServiceImpl extends LineFlowService implements LineInt messageMap.put("wantShopName", wantShopName); commonService.sendMessage(Arrays.asList(developmentManager), MessageEnum.MESSAGE_14, messageMap); Map requestMap = new HashMap<>(); - //todo 建店还未开始时 - requestMap.put("storeName","XXX"); requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("lineId",String.valueOf(lineInfo.getId())); 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 7a27e0f7d..cd0a2eaaa 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 @@ -210,8 +210,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu List temp = new ArrayList<>(); temp.add("object"); return FranchiseAgreementRequest.builder() -// todo .apply_user(user.getJobNumber()) - .apply_user("20230724") + .apply_user(user.getJobNumber()) .company(0) .start1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO, franchiseFeeDO.getFirstYearStartTime())) .start2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO, franchiseFeeDO.getSecondYearStartTime())) 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 6686cba22..030ceb597 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 @@ -286,8 +286,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe // accessory_address newStoreRequest.setAccessory_address(objects); // apply_user - //todo LoginUserInfo user - newStoreRequest.setApply_user("19110026"); + newStoreRequest.setApply_user(user.getJobNumber()); // city1 newStoreRequest.setCity1(pointInfoDO.getCity()); // csgs @@ -295,8 +294,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe newStoreRequest.setCsgs(thirdDepartmentDO.getDepartmentCode()); // csqmc newStoreRequest.setCsqmc(BusinessDistrictEnum.getByCode(sysStoreAppRequest.getStoreDetail().getSubBusinessType()).getDesc()); - //todo ddxm 督导 sysStoreAppRequest.getSupervisorDetail().getSupervisorId() - newStoreRequest.setDdxm("22090043"); + //ddxm 督导 + newStoreRequest.setDdxm(userMap.get(sysStoreAppRequest.getSupervisorDetail().getSupervisorId()).getJobnumber()); // dpzlht newStoreRequest.setDpzlht(objects); // end_time @@ -304,8 +303,8 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe // forecast_turnover newStoreRequest.setForecast_turnover(sysStoreAppRequest.getStoreDetail().getEstimatedTurnover()); // invite_people - //todo 邀约人 sysStoreAppRequest.getFranInfo().getInviteUserId() - newStoreRequest.setInvite_people("21100037"); + //邀约人 + newStoreRequest.setInvite_people(userMap.get(sysStoreAppRequest.getFranInfo().getInviteUserId()).getJobnumber()); // jms_id newStoreRequest.setJms_id(lineInfoDO.getPartnerNum()); // jmskhdjbwzjt @@ -322,12 +321,12 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe newStoreRequest.setLandlord_name(sysStoreAppRequest.getStoreDetail().getLandlordName()); // landlord_tel newStoreRequest.setLandlord_tel(sysStoreAppRequest.getStoreDetail().getLandlordMobile()); - //todo location_people 门店选址人 pointInfoDO.getDevelopmentManager() - newStoreRequest.setLocation_people("21100037"); + //location_people 门店选址人 + newStoreRequest.setLocation_people(userMap.get(pointInfoDO.getDevelopmentManager()).getJobnumber()); // mdyzj newStoreRequest.setMdyzj(sysStoreAppRequest.getStoreDetail().getStoreRent()); - //todo merchant_people 招商人工号 lineInfoDO.getInvestmentManager() - newStoreRequest.setMerchant_people("22090043"); + //merchant_people 招商人工号 + newStoreRequest.setMerchant_people(userMap.get(lineInfoDO.getInvestmentManager()).getJobnumber()); // name1 newStoreRequest.setName1(sysStoreAppRequest.getStoreDetail().getStoreName()); // regio diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index 2b8debe39..6159ee6e7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -119,7 +119,6 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr @Override public LeaseBaseInfoDO getTrainingExperience(Long lineId) { List roleNames = new ArrayList<>(); - //todo 写死 roleNames.add("加盟店店长"); roleNames.add("加盟店储备店长"); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java index 581eddad5..8835bed36 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TransferLogServiceImpl.java @@ -32,7 +32,6 @@ public class TransferLogServiceImpl implements TransferLogService { transferLogDO.setFromUserId(formUserId); transferLogDO.setToUserId(toUserId); transferLogDO.setType(operationLogTypeEnum.getCode()); - //todo 更改库的逻辑或增加获取当前操作人 transferLogDO.setCreateUserId("create"); transferLogDO.setUpdateUserId("update"); // 添加操作日志