From af6ec77b26434964496be73e91363e2e044ada18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 12 Jul 2024 17:03:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E7=9B=9F=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/request/ChangeInvestmentRequest.java | 2 ++ .../com/cool/store/vo/PublicLineListVO.java | 3 +++ .../com/cool/store/vo/desk/IntendPendingVO.java | 3 +++ .../com/cool/store/service/LineService.java | 8 ++++++++ .../store/service/impl/DeskServiceImpl.java | 1 + .../store/service/impl/LineServiceImpl.java | 17 +++++++++++++++++ .../controller/webb/LineInfoController.java | 7 +++++++ 7 files changed, 41 insertions(+) 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/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/LineServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineServiceImpl.java index baeb20980..d29aa9561 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 @@ -196,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())); @@ -314,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 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 f003ee205..804793422 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,4 +146,11 @@ public class LineInfoController { return ResponseResult.success(lineService.addLine(addLineRequest)); } + + @ApiOperation("修改加盟模式") + @PostMapping("/changeJoinMode") + public ResponseResult changeJoinMode(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) { + return ResponseResult.success(lineService.changeJoinMode(changeInvestmentRequest)); + } + }