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

Merge branch 'cc_20240716_partner_mode' into 'master'

Browse Source 
Cc 20240716 partner mode

See merge request hangzhou/java/custom_zxjp!9
This commit is contained in:
苏竹红
2024-07-16 01:55:40 +00:00
parent 9d27c807be 589dcfebba
commit aefcd78909
16 changed files with 79 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml
View File

@@ -24,6 +24,7 @@
<result column="user_portrait" jdbcType="VARCHAR" property="userPortrait" />
<result column="join_status" jdbcType="BIT" property="joinStatus" />
<result column="line_status" jdbcType="TINYINT" property="lineStatus" />
<result column="join_mode" jdbcType="TINYINT" property="joinMode" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="create_user_id" jdbcType="VARCHAR" property="createUserId" />
@@ -101,6 +102,9 @@
<if test="param.joinStatus != null">
join_status,
</if>
<if test="param.joinMode != null">
join_mode,
</if>
<if test="param.lineStatus != null">
line_status,
</if>
@@ -190,6 +194,9 @@
<if test="param.joinStatus != null">
#{param.joinStatus},
</if>
<if test="param.joinMode != null">
#{param.joinMode},
</if>
<if test="param.lineStatus != null">
#{param.lineStatus},
</if>
@@ -277,6 +284,9 @@
<if test="param.joinStatus != null">
join_status = #{param.joinStatus},
</if>
<if test="param.joinMode != null">
join_mode = #{param.joinMode},
</if>
<if test="param.lineStatus != null">
line_status = #{param.lineStatus},
</if>

3
coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java
View File

@@ -173,4 +173,7 @@ public class LineInfoDO {
@Column(name = "partner_num")
private String partnerNum;
@Column(name = "join_mode")
private Integer joinMode;
}

9
coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java
View File

@@ -2,6 +2,10 @@ package com.cool.store.request;
import lombok.Data;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
/**
* @Author suzhuhong
* @Date 2024/4/7 10:39
@@ -16,5 +20,10 @@ public class AddLineRequest {
private Long wantShopAreaId;
@NotNull
@Min(1)
@Max(2)
private Integer joinMode;
private String investmentManagerUserId;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/ChangeInvestmentRequest.java
View File

@@ -12,6 +12,8 @@ public class ChangeInvestmentRequest {
private String investmentManagerId;
private Integer joinMode;
private Long lineId;
}

2
coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java
View File

@@ -18,6 +18,8 @@ public class JoinIntentionRequest {
private String partnerId;
@ApiModelProperty("加盟身份 1个人加盟 2企业加盟")
private Integer joinType;
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
@ApiModelProperty("姓名")
private String userName;
@ApiModelProperty("手机号")

5
coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java
View File

@@ -33,17 +33,12 @@ public class OperationAuditRequest {
@ApiModelProperty("1通过,2拒绝")
private Integer auditStatus;
@NotNull
@ApiModelProperty("签到时间")
private Date signTime;
@NotNull
@NotBlank
@ApiModelProperty("签到位置")
private String signAddress;
@NotNull
@NotBlank
@ApiModelProperty("图片")
private String pictureUrl;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java
View File

@@ -85,6 +85,9 @@ public class LineInfoVO {
@ApiModelProperty("加盟身份 1个人加盟 2企业加盟")
private Integer joinType;
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
/**
* 流程子阶段
*/

3
coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java
View File

@@ -11,6 +11,9 @@ import lombok.Data;
@Data
public class LineListVO extends BaseInfoVO{
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
@ApiModelProperty("招商经理名称")
private String investmentManagerUserName;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java
View File

@@ -20,6 +20,9 @@ public class PartnerListVO extends BaseInfoVO{
@ApiModelProperty("1-蓄水池 2-加盟商")
private Integer joinStatus;
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
@ApiModelProperty("扩展经理名称")
private String developmentManagerUserName;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/PublicLineListVO.java
View File

@@ -13,6 +13,9 @@ import java.util.List;
@Data
public class PublicLineListVO extends BaseInfoVO{
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
@ApiModelProperty("招商经理名称")
private String lastInvestmentManagerUserName;

3
coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java
View File

@@ -17,6 +17,9 @@ public class IntendPendingVO extends BaseInfoVO {
@ApiModelProperty("提交时间")
private Date joinTime;
@ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式")
private Integer joinMode;
public IntendPendingVO(){}
public IntendPendingVO(BaseInfoVO baseInfoVO) {

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

7
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
View File

@@ -146,4 +146,11 @@ public class LineInfoController {
return ResponseResult.success(lineService.addLine(addLineRequest));
}
@ApiOperation("修改加盟模式")
@PostMapping("/changeJoinMode")
public ResponseResult<Boolean> changeJoinMode(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) {
return ResponseResult.success(lineService.changeJoinMode(changeInvestmentRequest));
}
}