Merge branch 'cc_partener_todo' into 'master'

todo

See merge request hangzhou/java/custom_xfsg!4

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(user.getJobNumber());
-        initiatingDO.setApply_user("22090043");
+        initiatingDO.setApply_user_name(user.getName());
-        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());
@@ -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(user.getJobNumber());
-        franchiseeDO.setOperator("22090043");
         MemberQuestionDO memberQuestionDO = joinIntentionMapper.getByLineId(lineInfoDO.getId());
         //如果是企业加盟，需要传有效期和法人
         if (Objects.nonNull(memberQuestionDO) && Constants.TWO_INTEGER.equals(memberQuestionDO.getJoinType())){

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

coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java

@@ -64,7 +64,7 @@ public class KdzApiServiceImpl implements KdzApiService {
                 .storeBusinessType(Objects.requireNonNull(LicenseTypeEnum.match(licenseTransactDO.getLicenseType())).getMessage())
                 .storeBusinessValidPeriod(Objects.isNull(licenseTransactDO.getValidity()) ? "9" : DateUtils.dateTime(licenseTransactDO.getValidity()))
                 .storeCode(storeNum)
-                .storeDirector(licenseTransactDO.getLicenseLegalPerson())
+                .storeDirector(licenseTransactDO.getOperator())
                 .storeFoodLicense(licenseTransactDO.getFoodBusinessLicenseCode())
                 .storeFoodLicenseBeginDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessStartTime()))
                 .storeFoodLicenseEndDate(DateUtils.dateTime(licenseTransactDO.getFoodBusinessEndTime()))

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SeeAcceptanceServiceImpl.java

@@ -96,7 +96,6 @@ public class SeeAcceptanceServiceImpl implements SeeAcceptanceService {
         } else {
             shopAuditInfoDO.setRejectReason(request.getReason());
         }
-        // TODO xfsg_user_detail_id
         shopAuditInfoDO.setCreateTime(new Date());
         shopAuditInfoDO.setDataType(CommonConstants.ONE);
         Long id = shopAuditInfoDAO.addAuditInfo(shopAuditInfoDO);

coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java

@@ -211,8 +211,7 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu
         List<String> temp = new ArrayList<>();
         temp.add("object");
         return FranchiseAgreementRequest.builder()
-//                todo .apply_user(user.getJobNumber())
+                .apply_user(user.getJobNumber())
-                .apply_user("20230724")
                 .company(0)
                 .start1(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO, franchiseFeeDO.getFirstYearStartTime()))
                 .start2(getDateTimeFormat(Constants.TIME_STAMP_FLAG_TWO, franchiseFeeDO.getSecondYearStartTime()))

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(user.getJobNumber());
-        newStoreRequest.setApply_user("19110026");
         // 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()
+        //ddxm  督导
-        newStoreRequest.setDdxm("22090043");
+        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()
+        //location_people 门店选址人
-        newStoreRequest.setLocation_people("21100037");
+        newStoreRequest.setLocation_people(userMap.get(pointInfoDO.getDevelopmentManager()).getJobnumber());
         // mdyzj
         newStoreRequest.setMdyzj(sysStoreAppRequest.getStoreDetail().getStoreRent());
-        //todo merchant_people 招商人工号 lineInfoDO.getInvestmentManager()
+        //merchant_people 招商人工号
-        newStoreRequest.setMerchant_people("22090043");
+        newStoreRequest.setMerchant_people(userMap.get(lineInfoDO.getInvestmentManager()).getJobnumber());
         // name1
         newStoreRequest.setName1(sysStoreAppRequest.getStoreDetail().getStoreName());
         // regio

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");
         // 添加操作日志