BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 85c9524a2d204953134bee76fdce220bf81a57cd

Authored by 芋道源码
Committed by Gitee
2 parents c726cd3a e5c3e69f

!880 CRM: 完善回款 

Merge pull request !880 from puhui999/develop
Inline Side-by-side
Showing 12 changed files with 57 additions and 20 deletions
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/CrmContractController.java
  View file @85c9524
... ... @@ -229,4 +229,13 @@ public class CrmContractController {
229 229 return success(contractService.getRemindContractCount(getLoginUserId()));
230 230 }
231 231  
  232 + @GetMapping("/list-all-simple-by-customer")
  233 + @Operation(summary = "获得合同精简列表", description = "只包含有读权限的客户的合同，主要用于前端的下拉选项")
  234 + @Parameter(name = "customerId", description = "客户编号", required = true)
  235 + @PreAuthorize("@ss.hasPermission('crm:contract:query')")
  236 + public CommonResult<List<CrmContractRespVO>> getListAllSimpleByCustomer(@RequestParam("customerId") Long customerId) {
  237 + PageResult<CrmContractDO> result = contractService.getContractPageByCustomerId(new CrmContractPageReqVO().setCustomerId(customerId));
  238 + return success(BeanUtils.toBean(result.getList(), CrmContractRespVO.class));
  239 + }
  240 +
232 241 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
  View file @85c9524
... ... @@ -153,7 +153,7 @@ public class CrmReceivableController {
153 153  
154 154 @PutMapping("/submit")
155 155 @Operation(summary = "提交回款审批")
156   - @PreAuthorize("@ss.hasPermission('crm:receivable:submit')")
  156 + @PreAuthorize("@ss.hasPermission('crm:receivable:update')")
157 157 public CommonResult<Boolean> submitContract(@RequestParam("id") Long id) {
158 158 receivableService.submitReceivable(id, getLoginUserId());
159 159 return success(true);
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
  View file @85c9524
... ... @@ -24,6 +24,7 @@ import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
24 24 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
25 25 import io.swagger.v3.oas.annotations.Operation;
26 26 import io.swagger.v3.oas.annotations.Parameter;
  27 +import io.swagger.v3.oas.annotations.Parameters;
27 28 import io.swagger.v3.oas.annotations.tags.Tag;
28 29 import jakarta.annotation.Resource;
29 30 import jakarta.servlet.http.HttpServletResponse;
... ... @@ -159,4 +160,18 @@ public class CrmReceivablePlanController {
159 160 return success(receivablePlanService.getRemindReceivablePlanCount(getLoginUserId()));
160 161 }
161 162  
  163 + @GetMapping("/list-all-simple-by-customer")
  164 + @Operation(summary = "获得回款计划精简列表", description = "获得回款计划精简列表，主要用于前端的下拉选项")
  165 + @Parameters({
  166 + @Parameter(name = "customerId", description = "客户编号", required = true),
  167 + @Parameter(name = "contractId", description = "合同编号", required = true)
  168 + })
  169 + @PreAuthorize("@ss.hasPermission('crm:receivable-plan:query')")
  170 + public CommonResult<List<CrmReceivablePlanRespVO>> getListAllSimpleByCustomer(@RequestParam("customerId") Long customerId,
  171 + @RequestParam("contractId") Long contractId) {
  172 + PageResult<CrmReceivablePlanDO> result = receivablePlanService.getReceivablePlanPageByCustomerId(
  173 + new CrmReceivablePlanPageReqVO().setCustomerId(customerId).setContractId(contractId));
  174 + return success(BeanUtils.toBean(result.getList(), CrmReceivablePlanRespVO.class));
  175 + }
  176 +
162 177 }
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanPageReqVO.java
  View file @85c9524
... ... @@ -30,8 +30,10 @@ public class CrmReceivablePlanPageReqVO extends PageParam {
30 30 @Schema(description = "客户编号", example = "18026")
31 31 private Long customerId;
32 32  
33   - // TODO @芋艿：这个搜的应该是合同编号 no
34   - @Schema(description = "合同名称", example = "3473")
  33 + @Schema(description = "合同编号", example = "H3473")
  34 + private String contractNo;
  35 +
  36 + @Schema(description = "合同编号", example = "3473")
35 37 private Long contractId;
36 38  
37 39 @Schema(description = "场景类型", example = "1")
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanSaveReqVO.java
  View file @85c9524
... ... @@ -37,6 +37,10 @@ public class CrmReceivablePlanSaveReqVO {
37 37 @NotNull(message = "计划回款金额不能为空")
38 38 private BigDecimal price;
39 39  
  40 + @Schema(description = "提醒日期", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  41 + @NotNull(message = "提醒日期不能为空")
  42 + private LocalDateTime remindTime;
  43 +
40 44 @Schema(description = "提前几天提醒", example = "1")
41 45 private Integer remindDays;
42 46  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivablePageReqVO.java
  View file @85c9524
... ... @@ -24,6 +24,9 @@ public class CrmReceivablePageReqVO extends PageParam {
24 24 @Schema(description = "客户编号", example = "4963")
25 25 private Long customerId;
26 26  
  27 + @Schema(description = "合同编号", example = "4963")
  28 + private Long contractId;
  29 +
27 30 @Schema(description = "场景类型", example = "1")
28 31 @InEnum(CrmSceneTypeEnum.class)
29 32 private Integer sceneType; // 场景类型，为 null 时则表示全部
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableRespVO.java
  View file @85c9524
... ... @@ -38,9 +38,6 @@ public class CrmReceivableRespVO {
38 38 @Schema(description = "负责人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
39 39 private Long ownerUserId;
40 40  
41   - @Schema(description = "显示顺序")
42   - private Integer sort;
43   -
44 41 @Schema(description = "备注", example = "备注")
45 42 private String remark;
46 43  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableSaveReqVO.java
  View file @85c9524
... ... @@ -46,9 +46,6 @@ public class CrmReceivableSaveReqVO {
46 46 @NotNull(message = "负责人编号不能为空")
47 47 private Long ownerUserId;
48 48  
49   - @Schema(description = "显示顺序")
50   - private Integer sort;
51   -
52 49 @Schema(description = "备注", example = "备注")
53 50 private String remark;
54 51  
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/contract/CrmContractProductDO.java
  View file @85c9524
... ... @@ -46,7 +46,7 @@ public class CrmContractProductDO extends BaseDO {
46 46 */
47 47 private BigDecimal productPrice;
48 48 /**
49   - * 合同价格, 单位：分
  49 + * 合同价格, 单位：元
50 50 */
51 51 private BigDecimal contractPrice;
52 52 /**
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/receivable/CrmReceivableDO.java
  View file @85c9524
... ... @@ -68,10 +68,6 @@ public class CrmReceivableDO extends BaseDO {
68 68 */
69 69 private BigDecimal price;
70 70 /**
71   - * 显示顺序
72   - */
73   - private Integer sort;
74   - /**
75 71 * 备注
76 72 */
77 73 private String remark;
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java
  View file @85c9524
... ... @@ -28,6 +28,7 @@ public interface CrmReceivableMapper extends BaseMapperX&lt;CrmReceivableDO&gt; {
28 28 return selectPage(reqVO, new LambdaQueryWrapperX<CrmReceivableDO>()
29 29 .eq(CrmReceivableDO::getCustomerId, reqVO.getCustomerId()) // 必须传递
30 30 .eqIfPresent(CrmReceivableDO::getNo, reqVO.getNo())
  31 + .eqIfPresent(CrmReceivableDO::getContractId, reqVO.getContractId())
31 32 .eqIfPresent(CrmReceivableDO::getPlanId, reqVO.getPlanId())
32 33 .orderByDesc(CrmReceivableDO::getId));
33 34 }
... ... @@ -41,6 +42,7 @@ public interface CrmReceivableMapper extends BaseMapperX&lt;CrmReceivableDO&gt; {
41 42 query.selectAll(CrmReceivableDO.class)
42 43 .eqIfPresent(CrmReceivableDO::getNo, pageReqVO.getNo())
43 44 .eqIfPresent(CrmReceivableDO::getPlanId, pageReqVO.getPlanId())
  45 + .eqIfPresent(CrmReceivableDO::getContractId, pageReqVO.getContractId())
44 46 .eqIfPresent(CrmReceivableDO::getAuditStatus, pageReqVO.getAuditStatus())
45 47 .orderByDesc(CrmReceivableDO::getId);
46 48 return selectJoinPage(pageReqVO, CrmReceivableDO.class, query);
... ...
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivablePlanMapper.java
  View file @85c9524
... ... @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.crm.dal.mysql.receivable;
3 3 import cn.hutool.core.date.LocalDateTimeUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 5 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6   -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 6 import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
8 7 import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.plan.CrmReceivablePlanPageReqVO;
  8 +import cn.iocoder.yudao.module.crm.dal.dataobject.contract.CrmContractDO;
9 9 import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
10 10 import cn.iocoder.yudao.module.crm.enums.common.CrmBizTypeEnum;
11 11 import cn.iocoder.yudao.module.crm.enums.common.CrmSceneTypeEnum;
... ... @@ -15,6 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
15 15 import java.time.LocalDateTime;
16 16 import java.util.Collection;
17 17 import java.util.List;
  18 +import java.util.Objects;
18 19  
19 20 /**
20 21 * 回款计划 Mapper
... ... @@ -25,10 +26,15 @@ import java.util.List;
25 26 public interface CrmReceivablePlanMapper extends BaseMapperX<CrmReceivablePlanDO> {
26 27  
27 28 default PageResult<CrmReceivablePlanDO> selectPageByCustomerId(CrmReceivablePlanPageReqVO reqVO) {
28   - return selectPage(reqVO, new LambdaQueryWrapperX<CrmReceivablePlanDO>()
29   - .eq(CrmReceivablePlanDO::getCustomerId, reqVO.getCustomerId()) // 必须传递
  29 + MPJLambdaWrapperX<CrmReceivablePlanDO> query = new MPJLambdaWrapperX<>();
  30 + if (Objects.nonNull(reqVO.getContractNo())) { // 根据合同编号检索
  31 + query.innerJoin(CrmContractDO.class, on -> on.like(CrmContractDO::getNo, reqVO.getContractNo())
  32 + .eq(CrmContractDO::getId, CrmReceivablePlanDO::getContractId));
  33 + }
  34 + query.eq(CrmReceivablePlanDO::getCustomerId, reqVO.getCustomerId()) // 必须传递
30 35 .eqIfPresent(CrmReceivablePlanDO::getContractId, reqVO.getContractId())
31   - .orderByDesc(CrmReceivablePlanDO::getId));
  36 + .orderByDesc(CrmReceivablePlanDO::getPeriod);
  37 + return selectJoinPage(reqVO, CrmReceivablePlanDO.class, query);
32 38 }
33 39  
34 40 default PageResult<CrmReceivablePlanDO> selectPage(CrmReceivablePlanPageReqVO pageReqVO, Long userId) {
... ... @@ -40,7 +46,12 @@ public interface CrmReceivablePlanMapper extends BaseMapperX&lt;CrmReceivablePlanDO
40 46 query.selectAll(CrmReceivablePlanDO.class)
41 47 .eqIfPresent(CrmReceivablePlanDO::getCustomerId, pageReqVO.getCustomerId())
42 48 .eqIfPresent(CrmReceivablePlanDO::getContractId, pageReqVO.getContractId())
43   - .orderByDesc(CrmReceivablePlanDO::getId);
  49 + .orderByDesc(CrmReceivablePlanDO::getPeriod);
  50 +
  51 + if (Objects.nonNull(pageReqVO.getContractNo())) { // 根据合同编号检索
  52 + query.innerJoin(CrmContractDO.class, on -> on.like(CrmContractDO::getNo, pageReqVO.getContractNo())
  53 + .eq(CrmContractDO::getId, CrmReceivablePlanDO::getContractId));
  54 + }
44 55  
45 56 // Backlog: 回款提醒类型
46 57 // TODO: @dhb52 需要配置 提前提醒天数
... ... @@ -55,7 +66,8 @@ public interface CrmReceivablePlanMapper extends BaseMapperX&lt;CrmReceivablePlanDO
55 66 .lt(CrmReceivablePlanDO::getReturnTime, endOfToday);
56 67 } else if (CrmReceivablePlanPageReqVO.REMIND_TYPE_RECEIVED.equals(pageReqVO.getRemindType())) { // 已回款
57 68 query.isNotNull(CrmReceivablePlanDO::getReceivableId)
58   - .between(CrmReceivablePlanDO::getReturnTime, beginOfToday, endOfToday.plusDays(REMIND_DAYS));;
  69 + .between(CrmReceivablePlanDO::getReturnTime, beginOfToday, endOfToday.plusDays(REMIND_DAYS));
  70 + ;
59 71 }
60 72  
61 73 return selectJoinPage(pageReqVO, CrmReceivablePlanDO.class, query);
... ...