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

Merge remote-tracking branch 'origin/master' into cc_20240411_supportskip

Browse Source 
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
This commit is contained in:
苏竹红
2024-07-16 16:13:09 +08:00
parent 56e915919c aefcd78909
commit 5d46a10b4f
16 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,14 @@ public interface LineService {
*/
Boolean transferInvestmentManager(ChangeInvestmentRequest changeInvestmentRequest, LoginUserInfo userInfo,Boolean transferFlag);
/**
* 修改加盟模式
* @param changeInvestmentRequest
* @return
*/
Boolean changeJoinMode(ChangeInvestmentRequest changeInvestmentRequest);
/**
* 线索的各节点情况
* @param lineId

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

@@ -76,6 +76,7 @@ public class DeskServiceImpl implements DeskService {
BaseInfoVO baseInfoVO = convertToBaseInfoVO(x, userPortraitMap, wantShopAreaMap);
IntendPendingVO intendPendingVO = new IntendPendingVO(baseInfoVO);
intendPendingVO.setJoinTime(new Date());
intendPendingVO.setJoinMode(x.getJoinMode());
list.add(intendPendingVO);
});

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

@@ -85,6 +85,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt
Long regionId = regionAreaConfigDao.getByWantShopAreaId(lineInfoParam.getWantShopAreaId());
lineInfoParam.setRegionId(regionId);
}
lineInfoDO.setJoinMode(request.getJoinMode());
lineInfoDAO.insertOrUpdate(lineInfoParam);
QualificationsInfoDO qualificationsInfoDO = request.toQualificationsInfoDO();
qualificationsInfoDAO.insertOrUpdate(qualificationsInfoDO);

22
coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java
View File

@@ -165,6 +165,7 @@ public class LineServiceImpl implements LineService {
lineListVO.setCreateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getCreateTime()));
lineListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime()));
lineListVO.setLineSourceName(channelMapByIds.get(x.getLineSource()));
lineListVO.setJoinMode(x.getJoinMode());
lineListVO.setInvestmentManagerUserName(userNameMap.get(x.getInvestmentManager()));
lineListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId()));
result.add(lineListVO);
@@ -195,6 +196,7 @@ public class LineServiceImpl implements LineService {
publicLineListVO.setCreateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getCreateTime()));
publicLineListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime()));
publicLineListVO.setLineSourceName(channelMapByIds.get(x.getLineSource()));
publicLineListVO.setJoinMode(x.getJoinMode());
publicLineListVO.setLastInvestmentManagerUserName(userNameMap.get(x.getInvestmentManager()));
publicLineListVO.setLastDevelopmentManagerUserName(userNameMap.get(x.getDevelopmentManager()));
publicLineListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId()));
@@ -255,6 +257,7 @@ public class LineServiceImpl implements LineService {
partnerListVO.setUpdateTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, x.getUpdateTime()));
partnerListVO.setLineSourceName(channelMapByIds.get(x.getLineSource()));
partnerListVO.setJoinStatus(x.getJoinStatus());
partnerListVO.setJoinMode(x.getJoinMode());
partnerListVO.setPartnerNum(x.getPartnerNum());
partnerListVO.setInvestmentManagerUserName(userNameMap.get(x.getInvestmentManager()));
partnerListVO.setUpdateUserName(userNameMap.get(x.getUpdateUserId()));
@@ -312,6 +315,22 @@ public class LineServiceImpl implements LineService {
return Boolean.TRUE;
}
@Override
public Boolean changeJoinMode(ChangeInvestmentRequest changeInvestmentRequest) {
log.info("changeJoinMode request={}",JSONObject.toJSONString(changeInvestmentRequest));
if (changeInvestmentRequest.getLineId()==null||changeInvestmentRequest.getJoinMode()==null){
throw new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
}
//查询线索
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(changeInvestmentRequest.getLineId());
if (lineInfo==null){
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
}
lineInfo.setJoinMode(changeInvestmentRequest.getJoinMode());
lineInfo.setUpdateTime(new Date());
lineInfoDAO.updateLineInfo(lineInfo);
return Boolean.TRUE;
}
@Override
@@ -403,6 +422,7 @@ public class LineServiceImpl implements LineService {
lineInfoDO.setLineStatus(LineStatusEnum.PRIVATE_SEAS.getCode());
lineInfoDO.setWorkflowSubStage(WorkflowSubStageEnum.INTEND.getCode());
lineInfoDO.setMobile(addLineRequest.getMobile());
lineInfoDO.setJoinMode(addLineRequest.getJoinMode());
lineInfoDO.setWorkflowStage(WorkflowStageEnum.INTENT.getCode());
lineInfoDO.setWorkflowSubStageStatus(WorkflowSubStageStatusEnum.INTENT_0.getCode());
lineInfoDO.setWantShopAreaId(addLineRequest.getWantShopAreaId());
@@ -418,7 +438,7 @@ public class LineServiceImpl implements LineService {
userId = user.getUserId();
}
Long regionId = regionAreaConfigDao.getByWantShopAreaId(addLineRequest.getWantShopAreaId());
lineInfoDO.setBigRegionId(regionId);
lineInfoDO.setRegionId(regionId);
lineInfoDO.setInvestmentManager(userId);
lineInfoDO.setCreateUserId(userId);
lineInfoDO.setUpdateUserId(userId);