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

Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

Browse Source
This commit is contained in:
zhangchenbiao
2024-03-29 19:59:23 +08:00
parent af8eecc03e 0066c07b14
commit c3e5b0e53e
26 changed files with 832 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,18 +2,24 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder;
import com.cool.store.context.LoginUserInfo;
import com.cool.store.dto.TransferLogDTO;
import com.cool.store.request.AddTagsRequest;
import com.cool.store.request.ChangeInvestmentRequest;
import com.cool.store.request.LineListRequest;
import com.cool.store.request.PublicLineListRequest;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.LineService;
import com.cool.store.service.TransferLogService;
import com.cool.store.vo.LineInfoVO;
import com.cool.store.vo.LineListVO;
import com.cool.store.vo.PublicLineListVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -31,6 +37,8 @@ public class LineInfoController {
@Resource
LineService lineService;
@Resource
TransferLogService transferLogService;
@ApiOperation("查询线索详情")
@GetMapping("/getLineDetail")
@@ -41,7 +49,6 @@ public class LineInfoController {
return ResponseResult.success(lineService.getLineInfo(lineId));
}
@ApiOperation("我的线索")
@PostMapping("/getMyLineList")
public ResponseResult<PageInfo<LineListVO>> getLineList(@RequestBody LineListRequest lineListRequest) {
@@ -50,7 +57,6 @@ public class LineInfoController {
return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.FALSE));
}
@ApiOperation("团队线索")
@PostMapping("/getTeamLineList")
public ResponseResult<PageInfo<LineListVO>> getTeamLineList(@RequestBody LineListRequest lineListRequest) {
@@ -59,15 +65,48 @@ public class LineInfoController {
return ResponseResult.success(lineService.getLineList(lineListRequest,user,Boolean.TRUE));
}
@ApiOperation("公海线索")
@PostMapping("/getPublicLineList")
public ResponseResult<PageInfo<PublicLineListVO>> getTeamLineList(@RequestBody PublicLineListRequest publicLineListRequest) {
LoginUserInfo user = CurrentUserHolder.getUser();
user.setUserId("055740241221153440");
return ResponseResult.success(lineService.getPublicLineList(publicLineListRequest,user));
}
@PostMapping(path = "/addTags")
@ApiOperation("添加标签接口")
public ResponseResult<Boolean> addTags(@RequestBody AddTagsRequest addTagsRequest){
return ResponseResult.success(lineService.addTags(CurrentUserHolder.getUser(),addTagsRequest));
}
@ApiOperation("分配招商经理")
@PostMapping("/distributionInvestmentManager")
public ResponseResult<Boolean> distributionInvestmentManager(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) {
LoginUserInfo user = CurrentUserHolder.getUser();
user.setUserId("055740241221153440");
return ResponseResult.success(lineService.transferInvestmentManager(changeInvestmentRequest,user,Boolean.FALSE));
}
@ApiOperation("转让")
@PostMapping("/transferInvestmentManager")
public ResponseResult<Boolean> transferInvestmentManager(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) {
LoginUserInfo user = CurrentUserHolder.getUser();
user.setUserId("055740241221153440");
return ResponseResult.success(lineService.transferInvestmentManager(changeInvestmentRequest,user,Boolean.TRUE));
}
@ApiOperation("线索转让记录")
@GetMapping("/getTransferLogPage")
@ApiImplicitParams({
@ApiImplicitParam(name = "lineId", value = "线索id", required = true),
@ApiImplicitParam(name = "pageNum", value = "页码", required = true),
@ApiImplicitParam(name = "pageSize", value = "大小", required = true)
})
public ResponseResult<PageInfo<TransferLogDTO>> getTransferLogPage(@RequestParam("lineId")Long lineId,
@RequestParam(value = "pageNum" ,defaultValue = "1")Integer pageNum,
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize) {
return ResponseResult.success(transferLogService.getTransferLogPage(pageNum,pageSize,lineId));
}
}

10
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/BankController.java
View File

@@ -10,10 +10,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -38,8 +36,8 @@ public class BankController {
}
@ApiOperation("支行列表查询")
@GetMapping("/listBranchBank")
public ResponseResult<PageInfo<BankdocDO>> listBranchBank(@RequestBody BranchBankPageRequest request) {
@PostMapping("/listBranchBank")
public ResponseResult<PageInfo<BankdocDO>> listBranchBank(@RequestBody @Validated BranchBankPageRequest request) {
return ResponseResult.success(bankService.listBranchBank(request));
}