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

优化

Browse Source
This commit is contained in:
guohb
2024-05-07 13:45:00 +08:00
parent c2982e7fe5
commit bf34c9fb14
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,6 +188,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
return new ResponseResult(500, initiatingResponse.getMsg(), initiatingResponse.getData());
} else {
String redisKey = "OA:" + request.getMobile() + request.getIdCardNo();
log.info("initiating redisKey:{},request:{}",redisKey,JSONObject.toJSONString(request));
redisUtilPool.setString(redisKey, JSONObject.toJSONString(request));
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_75.getCode());
lineInfoMapper.updateByPrimaryKeySelective(lineInfoDO);

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

@@ -32,10 +32,9 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@Service
@Slf4j
@@ -259,14 +258,22 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
SysStoreAppRequest sysStoreAppRequest,
LineInfoDO lineInfoDO,
PointInfoDO pointInfoDO) {
//用户信息map
List<String> userIdList = new ArrayList<>();
userIdList.add(sysStoreAppRequest.getSupervisorDetail().getSupervisorId());//督导
userIdList.add(sysStoreAppRequest.getFranInfo().getInviteUserId());//邀约人
userIdList.add(pointInfoDO.getDevelopmentManager());//选址人
userIdList.add(lineInfoDO.getInvestmentManager());//招商人
List<EnterpriseUserDO> userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdList);
Map<String, EnterpriseUserDO> userMap = userInfoByUserIds.stream().collect(Collectors.toMap(k -> k.getUserId(), Function.identity()));
NewStoreRequest newStoreRequest = new NewStoreRequest();
ArrayList<String> objects = new ArrayList<>();
objects.add("123");
// accessory_address
newStoreRequest.setAccessory_address(objects);
// apply_user
LoginUserInfo user = CurrentUserHolder.getUser();
//todo 写死
//todo LoginUserInfo user = CurrentUserHolder.getUser();
newStoreRequest.setApply_user("19110026");
// city1
newStoreRequest.setCity1(pointInfoDO.getCity());
@@ -275,8 +282,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
newStoreRequest.setCsgs(thirdDepartmentDO.getDepartmentCode());
// csqmc
newStoreRequest.setCsqmc(BusinessDistrictEnum.getByCode(sysStoreAppRequest.getStoreDetail().getSubBusinessType()).getDesc());
// ddxm
EnterpriseUserDO ddxm = enterpriseUserMapper.getUserInfoById(sysStoreAppRequest.getSupervisorDetail().getSupervisorId());//督导
//todo ddxm 督导 sysStoreAppRequest.getSupervisorDetail().getSupervisorId()
newStoreRequest.setDdxm("22090043");
// dpzlht
newStoreRequest.setDpzlht(objects);
@@ -285,8 +291,7 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
// forecast_turnover
newStoreRequest.setForecast_turnover(sysStoreAppRequest.getStoreDetail().getEstimatedTurnover());
// invite_people
//todo xiesi
EnterpriseUserDO invitePeople = enterpriseUserMapper.getUserInfoById(sysStoreAppRequest.getFranInfo().getInviteUserId());//邀约人
//todo 邀约人 sysStoreAppRequest.getFranInfo().getInviteUserId()
newStoreRequest.setInvite_people("21100037");
// jms_id
newStoreRequest.setJms_id(lineInfoDO.getPartnerNum());
@@ -304,15 +309,11 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer
newStoreRequest.setLandlord_name(sysStoreAppRequest.getStoreDetail().getLandlordName());
// landlord_tel
newStoreRequest.setLandlord_tel(sysStoreAppRequest.getStoreDetail().getLandlordMobile());
// location_people
EnterpriseUserDO locationPeople = enterpriseUserMapper.getUserInfoById(pointInfoDO.getDevelopmentManager());//门店选址人
//todo 写死
//todo location_people 门店选址人 pointInfoDO.getDevelopmentManager()
newStoreRequest.setLocation_people("21100037");
// mdyzj
newStoreRequest.setMdyzj(sysStoreAppRequest.getStoreDetail().getStoreRent());
// merchant_people
EnterpriseUserDO merchantPeople = enterpriseUserMapper.getUserInfoById(lineInfoDO.getInvestmentManager());//招商人工号
//todo 写死
//todo merchant_people 招商人工号 lineInfoDO.getInvestmentManager()
newStoreRequest.setMerchant_people("22090043");
// name1
newStoreRequest.setName1(sysStoreAppRequest.getStoreDetail().getStoreName());

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

@@ -105,7 +105,7 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr
@Override
public LeaseBaseInfoDO getTrainingExperience(Long lineId) {
List<String> roleNames = new ArrayList<>();
//todo 写死了，记得改
//todo 写死
roleNames.add("加盟店店长");
roleNames.add("加盟店储备店长");