diff --git a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml index bf65ab919..78e2772a9 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml @@ -24,6 +24,7 @@ + @@ -101,6 +102,9 @@ join_status, + + join_mode, + line_status, @@ -190,6 +194,9 @@ #{param.joinStatus}, + + #{param.joinMode}, + #{param.lineStatus}, @@ -277,6 +284,9 @@ join_status = #{param.joinStatus}, + + join_mode = #{param.joinMode}, + line_status = #{param.lineStatus}, diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java index 4be2b2613..e13344004 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/LineInfoDO.java @@ -173,4 +173,7 @@ public class LineInfoDO { @Column(name = "partner_num") private String partnerNum; + @Column(name = "join_mode") + private Integer joinMode; + } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java index 7614775ab..33903ea5c 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/AddLineRequest.java @@ -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; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ChangeInvestmentRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ChangeInvestmentRequest.java index 148ca089e..a2b569cd8 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ChangeInvestmentRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ChangeInvestmentRequest.java @@ -12,6 +12,8 @@ public class ChangeInvestmentRequest { private String investmentManagerId; + private Integer joinMode; + private Long lineId; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java index ebb1a461a..21052b687 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/JoinIntentionRequest.java @@ -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("手机号") diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java index 9def73b2c..00fe30049 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/OperationAuditRequest.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java index ffe30879e..01362bf7a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineInfoVO.java @@ -85,6 +85,9 @@ public class LineInfoVO { @ApiModelProperty("加盟身份 1个人加盟 2企业加盟") private Integer joinType; + @ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式") + private Integer joinMode; + /** * 流程子阶段 */ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java index 44467dc95..064d1241a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/LineListVO.java @@ -11,6 +11,9 @@ import lombok.Data; @Data public class LineListVO extends BaseInfoVO{ + @ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式") + private Integer joinMode; + @ApiModelProperty("招商经理名称") private String investmentManagerUserName; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java index 6591751ef..9c5c91c61 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerListVO.java @@ -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; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicLineListVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicLineListVO.java index 5ab5962b6..9a409a2e6 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicLineListVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/PublicLineListVO.java @@ -13,6 +13,9 @@ import java.util.List; @Data public class PublicLineListVO extends BaseInfoVO{ + @ApiModelProperty("加盟模式 1-社会加盟模式 2-强加盟模式") + private Integer joinMode; + @ApiModelProperty("招商经理名称") private String lastInvestmentManagerUserName; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java index fa2fb0e6e..7779e9c47 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/desk/IntendPendingVO.java @@ -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) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java index 0d3544f6b..7d7bacdba 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/LineService.java @@ -65,6 +65,14 @@ public interface LineService { */ Boolean transferInvestmentManager(ChangeInvestmentRequest changeInvestmentRequest, LoginUserInfo userInfo,Boolean transferFlag); + + /** + * 修改加盟模式 + * @param changeInvestmentRequest + * @return + */ + Boolean changeJoinMode(ChangeInvestmentRequest changeInvestmentRequest); + /** * 线索的各节点情况 * @param lineId diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 08985afed..1013d9852 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -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); }); 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 c40a5458e..9286be58d 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 @@ -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); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index 692b497ca..406f7055c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java @@ -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); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java index 0d786233c..8278371d3 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java @@ -146,6 +146,13 @@ public class LineInfoController { return ResponseResult.success(lineService.addLine(addLineRequest)); } + + @ApiOperation("修改加盟模式") + @PostMapping("/changeJoinMode") + public ResponseResult changeJoinMode(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) { + return ResponseResult.success(lineService.changeJoinMode(changeInvestmentRequest)); + } + @ApiOperation("跳过意向金") @GetMapping("/skipPay") @ApiImplicitParams({