修改加盟模式

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

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;
 

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

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

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

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

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<Boolean> changeJoinMode(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) {
+        return ResponseResult.success(lineService.changeJoinMode(changeInvestmentRequest));
+    }
+
 }