huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2025-01-19 11:40:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【修改】回款计划和回款管理统一带上Crm前缀，防止和其他模块冲突。

Browse Source
This commit is contained in:
liuhongfeng 2023-10-31 01:09:40 +08:00
parent f1f180ff77
commit 95e9dc81c9
34 changed files with 423 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/ReceivableController.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivableController.java
View File

@ -5,9 +5,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
import cn.iocoder.yudao.module.crm.convert.receivable.ReceivableConvert; import cn.iocoder.yudao.module.crm.convert.receivable.CrmReceivableConvert;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivableDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
import cn.iocoder.yudao.module.crm.service.receivable.ReceivableService; import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivableService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
@ -28,23 +28,23 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
@RestController @RestController
@RequestMapping("/crm/receivable") @RequestMapping("/crm/receivable")
@Validated @Validated
public class ReceivableController { public class CrmReceivableController {
@Resource @Resource
private ReceivableService receivableService; private CrmReceivableService crmReceivableService;
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建回款管理") @Operation(summary = "创建回款管理")
@PreAuthorize("@ss.hasPermission('crm:receivable:create')") @PreAuthorize("@ss.hasPermission('crm:receivable:create')")
public CommonResult<Long> createReceivable(@Valid @RequestBody ReceivableCreateReqVO createReqVO) { public CommonResult<Long> createReceivable(@Valid @RequestBody CrmReceivableCreateReqVO createReqVO) {
return success(receivableService.createReceivable(createReqVO)); return success(crmReceivableService.createReceivable(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新回款管理") @Operation(summary = "更新回款管理")
@PreAuthorize("@ss.hasPermission('crm:receivable:update')") @PreAuthorize("@ss.hasPermission('crm:receivable:update')")
public CommonResult<Boolean> updateReceivable(@Valid @RequestBody ReceivableUpdateReqVO updateReqVO) { public CommonResult<Boolean> updateReceivable(@Valid @RequestBody CrmReceivableUpdateReqVO updateReqVO) {
receivableService.updateReceivable(updateReqVO); crmReceivableService.updateReceivable(updateReqVO);
return success(true); return success(true);
} }
@ -53,7 +53,7 @@ public class ReceivableController {
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('crm:receivable:delete')") @PreAuthorize("@ss.hasPermission('crm:receivable:delete')")
public CommonResult<Boolean> deleteReceivable(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteReceivable(@RequestParam("id") Long id) {
receivableService.deleteReceivable(id); crmReceivableService.deleteReceivable(id);
return success(true); return success(true);
} }
@ -61,29 +61,29 @@ public class ReceivableController {
@Operation(summary = "获得回款管理") @Operation(summary = "获得回款管理")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('crm:receivable:query')") @PreAuthorize("@ss.hasPermission('crm:receivable:query')")
public CommonResult<ReceivableRespVO> getReceivable(@RequestParam("id") Long id) { public CommonResult<CrmReceivableRespVO> getReceivable(@RequestParam("id") Long id) {
ReceivableDO receivable = receivableService.getReceivable(id); CrmReceivableDO receivable = crmReceivableService.getReceivable(id);
return success(ReceivableConvert.INSTANCE.convert(receivable)); return success(CrmReceivableConvert.INSTANCE.convert(receivable));
} }
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得回款管理分页") @Operation(summary = "获得回款管理分页")
@PreAuthorize("@ss.hasPermission('crm:receivable:query')") @PreAuthorize("@ss.hasPermission('crm:receivable:query')")
public CommonResult<PageResult<ReceivableRespVO>> getReceivablePage(@Valid ReceivablePageReqVO pageVO) { public CommonResult<PageResult<CrmReceivableRespVO>> getReceivablePage(@Valid CrmReceivablePageReqVO pageVO) {
PageResult<ReceivableDO> pageResult = receivableService.getReceivablePage(pageVO); PageResult<CrmReceivableDO> pageResult = crmReceivableService.getReceivablePage(pageVO);
return success(ReceivableConvert.INSTANCE.convertPage(pageResult)); return success(CrmReceivableConvert.INSTANCE.convertPage(pageResult));
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出回款管理 Excel") @Operation(summary = "导出回款管理 Excel")
@PreAuthorize("@ss.hasPermission('crm:receivable:export')") @PreAuthorize("@ss.hasPermission('crm:receivable:export')")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public void exportReceivableExcel(@Valid ReceivableExportReqVO exportReqVO, public void exportReceivableExcel(@Valid CrmReceivableExportReqVO exportReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
List<ReceivableDO> list = receivableService.getReceivableList(exportReqVO); List<CrmReceivableDO> list = crmReceivableService.getReceivableList(exportReqVO);
// 导出 Excel // 导出 Excel
List<ReceivableExcelVO> datas = ReceivableConvert.INSTANCE.convertList02(list); List<CrmReceivableExcelVO> datas = CrmReceivableConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "回款管理.xls", "数据", ReceivableExcelVO.class, datas); ExcelUtils.write(response, "回款管理.xls", "数据", CrmReceivableExcelVO.class, datas);
} }
} }

40
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/ReceivablePlanController.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/CrmReceivablePlanController.java
View File

@ -5,9 +5,9 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
import cn.iocoder.yudao.module.crm.convert.receivable.ReceivablePlanConvert; import cn.iocoder.yudao.module.crm.convert.receivable.CrmReceivablePlanConvert;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import cn.iocoder.yudao.module.crm.service.receivable.ReceivablePlanService; import cn.iocoder.yudao.module.crm.service.receivable.CrmReceivablePlanService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
@ -28,23 +28,23 @@ import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.E
@RestController @RestController
@RequestMapping("/crm/receivable-plan") @RequestMapping("/crm/receivable-plan")
@Validated @Validated
public class ReceivablePlanController { public class CrmReceivablePlanController {
@Resource @Resource
private ReceivablePlanService receivablePlanService; private CrmReceivablePlanService crmReceivablePlanService;
@PostMapping("/create") @PostMapping("/create")
@Operation(summary = "创建回款计划") @Operation(summary = "创建回款计划")
@PreAuthorize("@ss.hasPermission('crm:receivable-plan:create')") @PreAuthorize("@ss.hasPermission('crm:receivable-plan:create')")
public CommonResult<Long> createReceivablePlan(@Valid @RequestBody ReceivablePlanCreateReqVO createReqVO) { public CommonResult<Long> createReceivablePlan(@Valid @RequestBody CrmReceivablePlanCreateReqVO createReqVO) {
return success(receivablePlanService.createReceivablePlan(createReqVO)); return success(crmReceivablePlanService.createReceivablePlan(createReqVO));
} }
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新回款计划") @Operation(summary = "更新回款计划")
@PreAuthorize("@ss.hasPermission('crm:receivable-plan:update')") @PreAuthorize("@ss.hasPermission('crm:receivable-plan:update')")
public CommonResult<Boolean> updateReceivablePlan(@Valid @RequestBody ReceivablePlanUpdateReqVO updateReqVO) { public CommonResult<Boolean> updateReceivablePlan(@Valid @RequestBody CrmReceivablePlanUpdateReqVO updateReqVO) {
receivablePlanService.updateReceivablePlan(updateReqVO); crmReceivablePlanService.updateReceivablePlan(updateReqVO);
return success(true); return success(true);
} }
@ -53,7 +53,7 @@ public class ReceivablePlanController {
@Parameter(name = "id", description = "编号", required = true) @Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('crm:receivable-plan:delete')") @PreAuthorize("@ss.hasPermission('crm:receivable-plan:delete')")
public CommonResult<Boolean> deleteReceivablePlan(@RequestParam("id") Long id) { public CommonResult<Boolean> deleteReceivablePlan(@RequestParam("id") Long id) {
receivablePlanService.deleteReceivablePlan(id); crmReceivablePlanService.deleteReceivablePlan(id);
return success(true); return success(true);
} }
@ -61,29 +61,29 @@ public class ReceivablePlanController {
@Operation(summary = "获得回款计划") @Operation(summary = "获得回款计划")
@Parameter(name = "id", description = "编号", required = true, example = "1024") @Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('crm:receivable-plan:query')") @PreAuthorize("@ss.hasPermission('crm:receivable-plan:query')")
public CommonResult<ReceivablePlanRespVO> getReceivablePlan(@RequestParam("id") Long id) { public CommonResult<CrmReceivablePlanRespVO> getReceivablePlan(@RequestParam("id") Long id) {
ReceivablePlanDO receivablePlan = receivablePlanService.getReceivablePlan(id); CrmReceivablePlanDO receivablePlan = crmReceivablePlanService.getReceivablePlan(id);
return success(ReceivablePlanConvert.INSTANCE.convert(receivablePlan)); return success(CrmReceivablePlanConvert.INSTANCE.convert(receivablePlan));
} }
@GetMapping("/page") @GetMapping("/page")
@Operation(summary = "获得回款计划分页") @Operation(summary = "获得回款计划分页")
@PreAuthorize("@ss.hasPermission('crm:receivable-plan:query')") @PreAuthorize("@ss.hasPermission('crm:receivable-plan:query')")
public CommonResult<PageResult<ReceivablePlanRespVO>> getReceivablePlanPage(@Valid ReceivablePlanPageReqVO pageVO) { public CommonResult<PageResult<CrmReceivablePlanRespVO>> getReceivablePlanPage(@Valid CrmReceivablePlanPageReqVO pageVO) {
PageResult<ReceivablePlanDO> pageResult = receivablePlanService.getReceivablePlanPage(pageVO); PageResult<CrmReceivablePlanDO> pageResult = crmReceivablePlanService.getReceivablePlanPage(pageVO);
return success(ReceivablePlanConvert.INSTANCE.convertPage(pageResult)); return success(CrmReceivablePlanConvert.INSTANCE.convertPage(pageResult));
} }
@GetMapping("/export-excel") @GetMapping("/export-excel")
@Operation(summary = "导出回款计划 Excel") @Operation(summary = "导出回款计划 Excel")
@PreAuthorize("@ss.hasPermission('crm:receivable-plan:export')") @PreAuthorize("@ss.hasPermission('crm:receivable-plan:export')")
@OperateLog(type = EXPORT) @OperateLog(type = EXPORT)
public void exportReceivablePlanExcel(@Valid ReceivablePlanExportReqVO exportReqVO, public void exportReceivablePlanExcel(@Valid CrmReceivablePlanExportReqVO exportReqVO,
HttpServletResponse response) throws IOException { HttpServletResponse response) throws IOException {
List<ReceivablePlanDO> list = receivablePlanService.getReceivablePlanList(exportReqVO); List<CrmReceivablePlanDO> list = crmReceivablePlanService.getReceivablePlanList(exportReqVO);
// 导出 Excel // 导出 Excel
List<ReceivablePlanExcelVO> datas = ReceivablePlanConvert.INSTANCE.convertList02(list); List<CrmReceivablePlanExcelVO> datas = CrmReceivablePlanConvert.INSTANCE.convertList02(list);
ExcelUtils.write(response, "回款计划.xls", "数据", ReceivablePlanExcelVO.class, datas); ExcelUtils.write(response, "回款计划.xls", "数据", CrmReceivablePlanExcelVO.class, datas);
} }
} }

7
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivableBaseVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivableBaseVO.java
View File

@ -6,8 +6,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -17,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
*/ */
@Data @Data
public class ReceivableBaseVO { public class CrmReceivableBaseVO {
@Schema(description = "回款编号",requiredMode = Schema.RequiredMode.REQUIRED, example = "31177") @Schema(description = "回款编号",requiredMode = Schema.RequiredMode.REQUIRED, example = "31177")
private String no; private String no;
@ -57,4 +55,7 @@ public class ReceivableBaseVO {
@Schema(description = "备注", example = "备注") @Schema(description = "备注", example = "备注")
private String remark; private String remark;
@Schema(description = "完成状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private Integer status;
} }

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivableCreateReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivableCreateReqVO.java
View File

@ -1,14 +1,12 @@
package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo; package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo;
import lombok.*; import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - CRM 回款创建 Request VO") @Schema(description = "管理后台 - CRM 回款创建 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivableCreateReqVO extends ReceivableBaseVO { public class CrmReceivableCreateReqVO extends CrmReceivableBaseVO {
} }

8
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivableExcelVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivableExcelVO.java
View File

@ -1,12 +1,8 @@
package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo; package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo;
import cn.iocoder.yudao.module.system.enums.DictTypeConstants; import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
@ -20,7 +16,7 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
* @author 赤焰 * @author 赤焰
*/ */
@Data @Data
public class ReceivableExcelVO { public class CrmReceivableExcelVO {
@ExcelProperty("ID") @ExcelProperty("ID")
private Long id; private Long id;

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivableExportReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivableExportReqVO.java
View File

@ -11,9 +11,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
/** /**
* @author 赤焰 * @author 赤焰
*/ */
@Schema(description = "管理后台 - CRM 回款 Excel 导出 Request VO，参数和 ReceivablePageReqVO 是一致的") @Schema(description = "管理后台 - CRM 回款 Excel 导出 Request VO，参数和 CrmReceivablePageReqVO 是一致的")
@Data @Data
public class ReceivableExportReqVO { public class CrmReceivableExportReqVO {
@Schema(description = "回款编号") @Schema(description = "回款编号")
private String no; private String no;

3
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePageReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePageReqVO.java
View File

@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@ -16,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivablePageReqVO extends PageParam { public class CrmReceivablePageReqVO extends PageParam {
@Schema(description = "回款编号") @Schema(description = "回款编号")
private String no; private String no;

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePlanBaseVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePlanBaseVO.java
View File

@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
*/ */
@Data @Data
public class ReceivablePlanBaseVO { public class CrmReceivablePlanBaseVO {
@Schema(description = "期数", example = "1") @Schema(description = "期数", example = "1")
private Integer period; private Integer period;

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePlanCreateReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePlanCreateReqVO.java
View File

@ -1,14 +1,12 @@
package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo; package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo;
import lombok.*; import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import javax.validation.constraints.*;
@Schema(description = "管理后台 - CRM 回款计划创建 Request VO") @Schema(description = "管理后台 - CRM 回款计划创建 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivablePlanCreateReqVO extends ReceivablePlanBaseVO { public class CrmReceivablePlanCreateReqVO extends CrmReceivablePlanBaseVO {
} }

3
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePlanExcelVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePlanExcelVO.java
View File

@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo;
import cn.iocoder.yudao.module.system.enums.DictTypeConstants; import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
import lombok.*; import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
@ -17,7 +16,7 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
* @author 芋道源码 * @author 芋道源码
*/ */
@Data @Data
public class ReceivablePlanExcelVO { public class CrmReceivablePlanExcelVO {
@ExcelProperty("ID") @ExcelProperty("ID")
private Long id; private Long id;

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePlanExportReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePlanExportReqVO.java
View File

@ -8,9 +8,9 @@ import org.springframework.format.annotation.DateTimeFormat;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - CRM 回款计划 Excel 导出 Request VO，参数和 ReceivablePlanPageReqVO 是一致的") @Schema(description = "管理后台 - CRM 回款计划 Excel 导出 Request VO，参数和 CrmReceivablePlanPageReqVO 是一致的")
@Data @Data
public class ReceivablePlanExportReqVO { public class CrmReceivablePlanExportReqVO {
@Schema(description = "期数") @Schema(description = "期数")
private Integer period; private Integer period;

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePlanPageReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePlanPageReqVO.java
View File

@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivablePlanPageReqVO extends PageParam { public class CrmReceivablePlanPageReqVO extends PageParam {
@Schema(description = "完成状态", example = "2") @Schema(description = "完成状态", example = "2")
private Integer status; private Integer status;

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePlanRespVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePlanRespVO.java
View File

@ -8,7 +8,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivablePlanRespVO extends ReceivablePlanBaseVO { public class CrmReceivablePlanRespVO extends CrmReceivablePlanBaseVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25153") @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25153")
private Long id; private Long id;

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivablePlanUpdateReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivablePlanUpdateReqVO.java
View File

@ -2,14 +2,14 @@ package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*;
import javax.validation.constraints.*; import javax.validation.constraints.*;
@Schema(description = "管理后台 - CRM 回款计划更新 Request VO") @Schema(description = "管理后台 - CRM 回款计划更新 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivablePlanUpdateReqVO extends ReceivablePlanBaseVO { public class CrmReceivablePlanUpdateReqVO extends CrmReceivablePlanBaseVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25153") @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25153")
@NotNull(message = "ID不能为空") @NotNull(message = "ID不能为空")

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivableRespVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivableRespVO.java
View File

@ -8,7 +8,7 @@ import java.time.LocalDateTime;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivableRespVO extends ReceivableBaseVO { public class CrmReceivableRespVO extends CrmReceivableBaseVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25787") @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25787")
private Long id; private Long id;

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/ReceivableUpdateReqVO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/receivable/vo/CrmReceivableUpdateReqVO.java
View File

@ -2,14 +2,14 @@ package cn.iocoder.yudao.module.crm.controller.admin.receivable.vo;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.*;
import java.util.*;
import javax.validation.constraints.*; import javax.validation.constraints.*;
@Schema(description = "管理后台 - CRM 回款更新 Request VO") @Schema(description = "管理后台 - CRM 回款更新 Request VO")
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class ReceivableUpdateReqVO extends ReceivableBaseVO { public class CrmReceivableUpdateReqVO extends CrmReceivableBaseVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25787") @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "25787")
@NotNull(message = "ID不能为空") @NotNull(message = "ID不能为空")

34
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/receivable/CrmReceivableConvert.java Normal file
View File

@ -0,0 +1,34 @@
package cn.iocoder.yudao.module.crm.convert.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
/**
* 回款管理 Convert
*
* @author 赤焰
*/
@Mapper
public interface CrmReceivableConvert {
CrmReceivableConvert INSTANCE = Mappers.getMapper(CrmReceivableConvert.class);
CrmReceivableDO convert(CrmReceivableCreateReqVO bean);
CrmReceivableDO convert(CrmReceivableUpdateReqVO bean);
CrmReceivableRespVO convert(CrmReceivableDO bean);
List<CrmReceivableRespVO> convertList(List<CrmReceivableDO> list);
PageResult<CrmReceivableRespVO> convertPage(PageResult<CrmReceivableDO> page);
List<CrmReceivableExcelVO> convertList02(List<CrmReceivableDO> list);
}

34
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/receivable/CrmReceivablePlanConvert.java Normal file
View File

@ -0,0 +1,34 @@
package cn.iocoder.yudao.module.crm.convert.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
/**
* 回款计划 Convert
*
* @author 芋道源码
*/
@Mapper
public interface CrmReceivablePlanConvert {
CrmReceivablePlanConvert INSTANCE = Mappers.getMapper(CrmReceivablePlanConvert.class);
CrmReceivablePlanDO convert(CrmReceivablePlanCreateReqVO bean);
CrmReceivablePlanDO convert(CrmReceivablePlanUpdateReqVO bean);
CrmReceivablePlanRespVO convert(CrmReceivablePlanDO bean);
List<CrmReceivablePlanRespVO> convertList(List<CrmReceivablePlanDO> list);
PageResult<CrmReceivablePlanRespVO> convertPage(PageResult<CrmReceivablePlanDO> page);
List<CrmReceivablePlanExcelVO> convertList02(List<CrmReceivablePlanDO> list);
}

34
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/receivable/ReceivableConvert.java
View File

@ -1,34 +0,0 @@
package cn.iocoder.yudao.module.crm.convert.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivableDO;
/**
* 回款管理 Convert
*
* @author 赤焰
*/
@Mapper
public interface ReceivableConvert {
ReceivableConvert INSTANCE = Mappers.getMapper(ReceivableConvert.class);
ReceivableDO convert(ReceivableCreateReqVO bean);
ReceivableDO convert(ReceivableUpdateReqVO bean);
ReceivableRespVO convert(ReceivableDO bean);
List<ReceivableRespVO> convertList(List<ReceivableDO> list);
PageResult<ReceivableRespVO> convertPage(PageResult<ReceivableDO> page);
List<ReceivableExcelVO> convertList02(List<ReceivableDO> list);
}

34
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/convert/receivable/ReceivablePlanConvert.java
View File

@ -1,34 +0,0 @@
package cn.iocoder.yudao.module.crm.convert.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO;
/**
* 回款计划 Convert
*
* @author 芋道源码
*/
@Mapper
public interface ReceivablePlanConvert {
ReceivablePlanConvert INSTANCE = Mappers.getMapper(ReceivablePlanConvert.class);
ReceivablePlanDO convert(ReceivablePlanCreateReqVO bean);
ReceivablePlanDO convert(ReceivablePlanUpdateReqVO bean);
ReceivablePlanRespVO convert(ReceivablePlanDO bean);
List<ReceivablePlanRespVO> convertList(List<ReceivablePlanDO> list);
PageResult<ReceivablePlanRespVO> convertPage(PageResult<ReceivablePlanDO> page);
List<ReceivablePlanExcelVO> convertList02(List<ReceivablePlanDO> list);
}

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/receivable/ReceivableDO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/receivable/CrmReceivableDO.java
View File

@ -21,7 +21,7 @@ import java.time.LocalDateTime;
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class ReceivableDO extends BaseDO { public class CrmReceivableDO extends BaseDO {
/** /**
* ID * ID
@ -35,7 +35,7 @@ public class ReceivableDO extends BaseDO {
/** /**
* 回款计划 * 回款计划
* *
* 对应实体 {@link cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO} * 对应实体 {@link CrmReceivablePlanDO}
*/ */
private Long planId; private Long planId;
/** /**

3
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/receivable/ReceivablePlanDO.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/dataobject/receivable/CrmReceivablePlanDO.java
View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.crm.dal.dataobject.receivable;
import lombok.*; import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
@ -21,7 +20,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class ReceivablePlanDO extends BaseDO { public class CrmReceivablePlanDO extends BaseDO {
/** /**
* ID * ID

54
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivableMapper.java Normal file
View File

@ -0,0 +1,54 @@
package cn.iocoder.yudao.module.crm.dal.mysql.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
/**
* 回款管理 Mapper
*
* @author 赤焰
*/
@Mapper
public interface CrmReceivableMapper extends BaseMapperX<CrmReceivableDO> {
default PageResult<CrmReceivableDO> selectPage(CrmReceivablePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CrmReceivableDO>()
.eqIfPresent(CrmReceivableDO::getNo, reqVO.getNo())
.eqIfPresent(CrmReceivableDO::getPlanId, reqVO.getPlanId())
.eqIfPresent(CrmReceivableDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(CrmReceivableDO::getContractId, reqVO.getContractId())
.eqIfPresent(CrmReceivableDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(CrmReceivableDO::getReturnTime, reqVO.getReturnTime())
.eqIfPresent(CrmReceivableDO::getReturnType, reqVO.getReturnType())
.eqIfPresent(CrmReceivableDO::getPrice, reqVO.getPrice())
.eqIfPresent(CrmReceivableDO::getOwnerUserId, reqVO.getOwnerUserId())
.eqIfPresent(CrmReceivableDO::getStatus, reqVO.getStatus())
.betweenIfPresent(CrmReceivableDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(CrmReceivableDO::getId));
}
default List<CrmReceivableDO> selectList(CrmReceivableExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<CrmReceivableDO>()
.eqIfPresent(CrmReceivableDO::getNo, reqVO.getNo())
.eqIfPresent(CrmReceivableDO::getPlanId, reqVO.getPlanId())
.eqIfPresent(CrmReceivableDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(CrmReceivableDO::getContractId, reqVO.getContractId())
.eqIfPresent(CrmReceivableDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(CrmReceivableDO::getReturnTime, reqVO.getReturnTime())
.eqIfPresent(CrmReceivableDO::getReturnType, reqVO.getReturnType())
.eqIfPresent(CrmReceivableDO::getPrice, reqVO.getPrice())
.eqIfPresent(CrmReceivableDO::getOwnerUserId, reqVO.getOwnerUserId())
.eqIfPresent(CrmReceivableDO::getBatchId, reqVO.getBatchId())
.eqIfPresent(CrmReceivableDO::getStatus, reqVO.getStatus())
.eqIfPresent(CrmReceivableDO::getRemark, reqVO.getRemark())
.betweenIfPresent(CrmReceivableDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(CrmReceivableDO::getId));
}
}

49
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/CrmReceivablePlanMapper.java Normal file
View File

@ -0,0 +1,49 @@
package cn.iocoder.yudao.module.crm.dal.mysql.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
/**
* 回款计划 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface CrmReceivablePlanMapper extends BaseMapperX<CrmReceivablePlanDO> {
default PageResult<CrmReceivablePlanDO> selectPage(CrmReceivablePlanPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<CrmReceivablePlanDO>()
.eqIfPresent(CrmReceivablePlanDO::getStatus, reqVO.getStatus())
.eqIfPresent(CrmReceivablePlanDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(CrmReceivablePlanDO::getReturnTime, reqVO.getReturnTime())
.betweenIfPresent(CrmReceivablePlanDO::getRemindTime, reqVO.getRemindTime())
.eqIfPresent(CrmReceivablePlanDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(CrmReceivablePlanDO::getContractId, reqVO.getContractId())
.eqIfPresent(CrmReceivablePlanDO::getOwnerUserId, reqVO.getOwnerUserId())
.betweenIfPresent(CrmReceivablePlanDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(CrmReceivablePlanDO::getId));
}
default List<CrmReceivablePlanDO> selectList(CrmReceivablePlanExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<CrmReceivablePlanDO>()
.eqIfPresent(CrmReceivablePlanDO::getPeriod, reqVO.getPeriod())
.eqIfPresent(CrmReceivablePlanDO::getStatus, reqVO.getStatus())
.eqIfPresent(CrmReceivablePlanDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(CrmReceivablePlanDO::getReturnTime, reqVO.getReturnTime())
.eqIfPresent(CrmReceivablePlanDO::getRemindDays, reqVO.getRemindDays())
.betweenIfPresent(CrmReceivablePlanDO::getRemindTime, reqVO.getRemindTime())
.eqIfPresent(CrmReceivablePlanDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(CrmReceivablePlanDO::getContractId, reqVO.getContractId())
.eqIfPresent(CrmReceivablePlanDO::getOwnerUserId, reqVO.getOwnerUserId())
.eqIfPresent(CrmReceivablePlanDO::getRemark, reqVO.getRemark())
.betweenIfPresent(CrmReceivablePlanDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(CrmReceivablePlanDO::getId));
}
}

54
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/ReceivableMapper.java
View File

@ -1,54 +0,0 @@
package cn.iocoder.yudao.module.crm.dal.mysql.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivableDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
/**
* 回款管理 Mapper
*
* @author 赤焰
*/
@Mapper
public interface ReceivableMapper extends BaseMapperX<ReceivableDO> {
default PageResult<ReceivableDO> selectPage(ReceivablePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ReceivableDO>()
.eqIfPresent(ReceivableDO::getNo, reqVO.getNo())
.eqIfPresent(ReceivableDO::getPlanId, reqVO.getPlanId())
.eqIfPresent(ReceivableDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(ReceivableDO::getContractId, reqVO.getContractId())
.eqIfPresent(ReceivableDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(ReceivableDO::getReturnTime, reqVO.getReturnTime())
.eqIfPresent(ReceivableDO::getReturnType, reqVO.getReturnType())
.eqIfPresent(ReceivableDO::getPrice, reqVO.getPrice())
.eqIfPresent(ReceivableDO::getOwnerUserId, reqVO.getOwnerUserId())
.eqIfPresent(ReceivableDO::getStatus, reqVO.getStatus())
.betweenIfPresent(ReceivableDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(ReceivableDO::getId));
}
default List<ReceivableDO> selectList(ReceivableExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<ReceivableDO>()
.eqIfPresent(ReceivableDO::getNo, reqVO.getNo())
.eqIfPresent(ReceivableDO::getPlanId, reqVO.getPlanId())
.eqIfPresent(ReceivableDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(ReceivableDO::getContractId, reqVO.getContractId())
.eqIfPresent(ReceivableDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(ReceivableDO::getReturnTime, reqVO.getReturnTime())
.eqIfPresent(ReceivableDO::getReturnType, reqVO.getReturnType())
.eqIfPresent(ReceivableDO::getPrice, reqVO.getPrice())
.eqIfPresent(ReceivableDO::getOwnerUserId, reqVO.getOwnerUserId())
.eqIfPresent(ReceivableDO::getBatchId, reqVO.getBatchId())
.eqIfPresent(ReceivableDO::getStatus, reqVO.getStatus())
.eqIfPresent(ReceivableDO::getRemark, reqVO.getRemark())
.betweenIfPresent(ReceivableDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(ReceivableDO::getId));
}
}

49
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/receivable/ReceivablePlanMapper.java
View File

@ -1,49 +0,0 @@
package cn.iocoder.yudao.module.crm.dal.mysql.receivable;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
/**
* 回款计划 Mapper
*
* @author 芋道源码
*/
@Mapper
public interface ReceivablePlanMapper extends BaseMapperX<ReceivablePlanDO> {
default PageResult<ReceivablePlanDO> selectPage(ReceivablePlanPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<ReceivablePlanDO>()
.eqIfPresent(ReceivablePlanDO::getStatus, reqVO.getStatus())
.eqIfPresent(ReceivablePlanDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(ReceivablePlanDO::getReturnTime, reqVO.getReturnTime())
.betweenIfPresent(ReceivablePlanDO::getRemindTime, reqVO.getRemindTime())
.eqIfPresent(ReceivablePlanDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(ReceivablePlanDO::getContractId, reqVO.getContractId())
.eqIfPresent(ReceivablePlanDO::getOwnerUserId, reqVO.getOwnerUserId())
.betweenIfPresent(ReceivablePlanDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(ReceivablePlanDO::getId));
}
default List<ReceivablePlanDO> selectList(ReceivablePlanExportReqVO reqVO) {
return selectList(new LambdaQueryWrapperX<ReceivablePlanDO>()
.eqIfPresent(ReceivablePlanDO::getPeriod, reqVO.getPeriod())
.eqIfPresent(ReceivablePlanDO::getStatus, reqVO.getStatus())
.eqIfPresent(ReceivablePlanDO::getCheckStatus, reqVO.getCheckStatus())
.betweenIfPresent(ReceivablePlanDO::getReturnTime, reqVO.getReturnTime())
.eqIfPresent(ReceivablePlanDO::getRemindDays, reqVO.getRemindDays())
.betweenIfPresent(ReceivablePlanDO::getRemindTime, reqVO.getRemindTime())
.eqIfPresent(ReceivablePlanDO::getCustomerId, reqVO.getCustomerId())
.eqIfPresent(ReceivablePlanDO::getContractId, reqVO.getContractId())
.eqIfPresent(ReceivablePlanDO::getOwnerUserId, reqVO.getOwnerUserId())
.eqIfPresent(ReceivablePlanDO::getRemark, reqVO.getRemark())
.betweenIfPresent(ReceivablePlanDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(ReceivablePlanDO::getId));
}
}

16
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/ReceivablePlanService.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanService.java
View File

@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.crm.service.receivable;
import java.util.*; import java.util.*;
import javax.validation.*; import javax.validation.*;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
/** /**
@ -11,7 +11,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
* *
* @author 芋道源码 * @author 芋道源码
*/ */
public interface ReceivablePlanService { public interface CrmReceivablePlanService {
/** /**
* 创建回款计划 * 创建回款计划
@ -19,14 +19,14 @@ public interface ReceivablePlanService {
* @param createReqVO 创建信息 * @param createReqVO 创建信息
* @return 编号 * @return 编号
*/ */
Long createReceivablePlan(@Valid ReceivablePlanCreateReqVO createReqVO); Long createReceivablePlan(@Valid CrmReceivablePlanCreateReqVO createReqVO);
/** /**
* 更新回款计划 * 更新回款计划
* *
* @param updateReqVO 更新信息 * @param updateReqVO 更新信息
*/ */
void updateReceivablePlan(@Valid ReceivablePlanUpdateReqVO updateReqVO); void updateReceivablePlan(@Valid CrmReceivablePlanUpdateReqVO updateReqVO);
/** /**
* 删除回款计划 * 删除回款计划
@ -41,7 +41,7 @@ public interface ReceivablePlanService {
* @param id 编号 * @param id 编号
* @return 回款计划 * @return 回款计划
*/ */
ReceivablePlanDO getReceivablePlan(Long id); CrmReceivablePlanDO getReceivablePlan(Long id);
/** /**
* 获得回款计划列表 * 获得回款计划列表
@ -49,7 +49,7 @@ public interface ReceivablePlanService {
* @param ids 编号 * @param ids 编号
* @return 回款计划列表 * @return 回款计划列表
*/ */
List<ReceivablePlanDO> getReceivablePlanList(Collection<Long> ids); List<CrmReceivablePlanDO> getReceivablePlanList(Collection<Long> ids);
/** /**
* 获得回款计划分页 * 获得回款计划分页
@ -57,7 +57,7 @@ public interface ReceivablePlanService {
* @param pageReqVO 分页查询 * @param pageReqVO 分页查询
* @return 回款计划分页 * @return 回款计划分页
*/ */
PageResult<ReceivablePlanDO> getReceivablePlanPage(ReceivablePlanPageReqVO pageReqVO); PageResult<CrmReceivablePlanDO> getReceivablePlanPage(CrmReceivablePlanPageReqVO pageReqVO);
/** /**
* 获得回款计划列表, 用于 Excel 导出 * 获得回款计划列表, 用于 Excel 导出
@ -65,6 +65,6 @@ public interface ReceivablePlanService {
* @param exportReqVO 查询条件 * @param exportReqVO 查询条件
* @return 回款计划列表 * @return 回款计划列表
*/ */
List<ReceivablePlanDO> getReceivablePlanList(ReceivablePlanExportReqVO exportReqVO); List<CrmReceivablePlanDO> getReceivablePlanList(CrmReceivablePlanExportReqVO exportReqVO);
} }

53
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/ReceivablePlanServiceImpl.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
View File

@ -5,16 +5,15 @@ import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanCreateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanCreateReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanExportReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanExportReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanPageReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanUpdateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanUpdateReqVO;
import cn.iocoder.yudao.module.crm.convert.receivable.ReceivablePlanConvert; import cn.iocoder.yudao.module.crm.convert.receivable.CrmReceivablePlanConvert;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.ContractDO; import cn.iocoder.yudao.module.crm.dal.dataobject.contract.ContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO; import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivableDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO; import cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivablePlanMapper;
import cn.iocoder.yudao.module.crm.dal.mysql.receivable.ReceivablePlanMapper;
import cn.iocoder.yudao.module.crm.enums.AuditStatusEnum; import cn.iocoder.yudao.module.crm.enums.AuditStatusEnum;
import cn.iocoder.yudao.module.crm.service.contract.ContractService; import cn.iocoder.yudao.module.crm.service.contract.ContractService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService; import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
@ -35,19 +34,19 @@ import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
*/ */
@Service @Service
@Validated @Validated
public class ReceivablePlanServiceImpl implements ReceivablePlanService { public class CrmReceivablePlanServiceImpl implements CrmReceivablePlanService {
@Resource @Resource
private ReceivablePlanMapper receivablePlanMapper; private CrmReceivablePlanMapper crmReceivablePlanMapper;
@Resource @Resource
private ContractService contractService; private ContractService contractService;
@Resource @Resource
private CrmCustomerService crmCustomerService; private CrmCustomerService crmCustomerService;
@Override @Override
public Long createReceivablePlan(ReceivablePlanCreateReqVO createReqVO) { public Long createReceivablePlan(CrmReceivablePlanCreateReqVO createReqVO) {
// 插入 // 插入
ReceivablePlanDO receivablePlan = ReceivablePlanConvert.INSTANCE.convert(createReqVO); CrmReceivablePlanDO receivablePlan = CrmReceivablePlanConvert.INSTANCE.convert(createReqVO);
if (ObjectUtil.isNull(receivablePlan.getStatus())){ if (ObjectUtil.isNull(receivablePlan.getStatus())){
receivablePlan.setStatus(CommonStatusEnum.ENABLE.getStatus()); receivablePlan.setStatus(CommonStatusEnum.ENABLE.getStatus());
} }
@ -57,12 +56,12 @@ public class ReceivablePlanServiceImpl implements ReceivablePlanService {
checkReceivablePlan(receivablePlan); checkReceivablePlan(receivablePlan);
receivablePlanMapper.insert(receivablePlan); crmReceivablePlanMapper.insert(receivablePlan);
// 返回 // 返回
return receivablePlan.getId(); return receivablePlan.getId();
} }
private void checkReceivablePlan(ReceivablePlanDO receivablePlan) { private void checkReceivablePlan(CrmReceivablePlanDO receivablePlan) {
if(ObjectUtil.isNull(receivablePlan.getContractId())){ if(ObjectUtil.isNull(receivablePlan.getContractId())){
throw exception(CONTRACT_NOT_EXISTS); throw exception(CONTRACT_NOT_EXISTS);
@ -81,13 +80,13 @@ public class ReceivablePlanServiceImpl implements ReceivablePlanService {
} }
@Override @Override
public void updateReceivablePlan(ReceivablePlanUpdateReqVO updateReqVO) { public void updateReceivablePlan(CrmReceivablePlanUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validateReceivablePlanExists(updateReqVO.getId()); validateReceivablePlanExists(updateReqVO.getId());
// 更新 // 更新
ReceivablePlanDO updateObj = ReceivablePlanConvert.INSTANCE.convert(updateReqVO); CrmReceivablePlanDO updateObj = CrmReceivablePlanConvert.INSTANCE.convert(updateReqVO);
receivablePlanMapper.updateById(updateObj); crmReceivablePlanMapper.updateById(updateObj);
} }
@Override @Override
@ -95,36 +94,36 @@ public class ReceivablePlanServiceImpl implements ReceivablePlanService {
// 校验存在 // 校验存在
validateReceivablePlanExists(id); validateReceivablePlanExists(id);
// 删除 // 删除
receivablePlanMapper.deleteById(id); crmReceivablePlanMapper.deleteById(id);
} }
private void validateReceivablePlanExists(Long id) { private void validateReceivablePlanExists(Long id) {
if (receivablePlanMapper.selectById(id) == null) { if (crmReceivablePlanMapper.selectById(id) == null) {
throw exception(RECEIVABLE_PLAN_NOT_EXISTS); throw exception(RECEIVABLE_PLAN_NOT_EXISTS);
} }
} }
@Override @Override
public ReceivablePlanDO getReceivablePlan(Long id) { public CrmReceivablePlanDO getReceivablePlan(Long id) {
return receivablePlanMapper.selectById(id); return crmReceivablePlanMapper.selectById(id);
} }
@Override @Override
public List<ReceivablePlanDO> getReceivablePlanList(Collection<Long> ids) { public List<CrmReceivablePlanDO> getReceivablePlanList(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) { if (CollUtil.isEmpty(ids)) {
return ListUtil.empty(); return ListUtil.empty();
} }
return receivablePlanMapper.selectBatchIds(ids); return crmReceivablePlanMapper.selectBatchIds(ids);
} }
@Override @Override
public PageResult<ReceivablePlanDO> getReceivablePlanPage(ReceivablePlanPageReqVO pageReqVO) { public PageResult<CrmReceivablePlanDO> getReceivablePlanPage(CrmReceivablePlanPageReqVO pageReqVO) {
return receivablePlanMapper.selectPage(pageReqVO); return crmReceivablePlanMapper.selectPage(pageReqVO);
} }
@Override @Override
public List<ReceivablePlanDO> getReceivablePlanList(ReceivablePlanExportReqVO exportReqVO) { public List<CrmReceivablePlanDO> getReceivablePlanList(CrmReceivablePlanExportReqVO exportReqVO) {
return receivablePlanMapper.selectList(exportReqVO); return crmReceivablePlanMapper.selectList(exportReqVO);
} }
} }

16
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/ReceivableService.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableService.java
View File

@ -4,7 +4,7 @@ import java.util.*;
import javax.validation.*; import javax.validation.*;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.*;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivableDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
/** /**
@ -12,7 +12,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
* *
* @author 赤焰 * @author 赤焰
*/ */
public interface ReceivableService { public interface CrmReceivableService {
/** /**
* 创建回款管理 * 创建回款管理
@ -20,14 +20,14 @@ public interface ReceivableService {
* @param createReqVO 创建信息 * @param createReqVO 创建信息
* @return 编号 * @return 编号
*/ */
Long createReceivable(@Valid ReceivableCreateReqVO createReqVO); Long createReceivable(@Valid CrmReceivableCreateReqVO createReqVO);
/** /**
* 更新回款管理 * 更新回款管理
* *
* @param updateReqVO 更新信息 * @param updateReqVO 更新信息
*/ */
void updateReceivable(@Valid ReceivableUpdateReqVO updateReqVO); void updateReceivable(@Valid CrmReceivableUpdateReqVO updateReqVO);
/** /**
* 删除回款管理 * 删除回款管理
@ -42,7 +42,7 @@ public interface ReceivableService {
* @param id 编号 * @param id 编号
* @return 回款管理 * @return 回款管理
*/ */
ReceivableDO getReceivable(Long id); CrmReceivableDO getReceivable(Long id);
/** /**
* 获得回款管理列表 * 获得回款管理列表
@ -50,7 +50,7 @@ public interface ReceivableService {
* @param ids 编号 * @param ids 编号
* @return 回款管理列表 * @return 回款管理列表
*/ */
List<ReceivableDO> getReceivableList(Collection<Long> ids); List<CrmReceivableDO> getReceivableList(Collection<Long> ids);
/** /**
* 获得回款管理分页 * 获得回款管理分页
@ -58,7 +58,7 @@ public interface ReceivableService {
* @param pageReqVO 分页查询 * @param pageReqVO 分页查询
* @return 回款管理分页 * @return 回款管理分页
*/ */
PageResult<ReceivableDO> getReceivablePage(ReceivablePageReqVO pageReqVO); PageResult<CrmReceivableDO> getReceivablePage(CrmReceivablePageReqVO pageReqVO);
/** /**
* 获得回款管理列表, 用于 Excel 导出 * 获得回款管理列表, 用于 Excel 导出
@ -66,6 +66,6 @@ public interface ReceivableService {
* @param exportReqVO 查询条件 * @param exportReqVO 查询条件
* @return 回款管理列表 * @return 回款管理列表
*/ */
List<ReceivableDO> getReceivableList(ReceivableExportReqVO exportReqVO); List<CrmReceivableDO> getReceivableList(CrmReceivableExportReqVO exportReqVO);
} }

59
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/ReceivableServiceImpl.java → yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivableServiceImpl.java
View File

@ -3,19 +3,18 @@ package cn.iocoder.yudao.module.crm.service.receivable;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivableCreateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivableCreateReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivableExportReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivableExportReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePageReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivableUpdateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivableUpdateReqVO;
import cn.iocoder.yudao.module.crm.convert.receivable.ReceivableConvert; import cn.iocoder.yudao.module.crm.convert.receivable.CrmReceivableConvert;
import cn.iocoder.yudao.module.crm.dal.dataobject.contract.ContractDO; import cn.iocoder.yudao.module.crm.dal.dataobject.contract.ContractDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO; import cn.iocoder.yudao.module.crm.dal.dataobject.customer.CrmCustomerDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivableDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import cn.iocoder.yudao.module.crm.dal.mysql.receivable.ReceivableMapper; import cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivableMapper;
import cn.iocoder.yudao.module.crm.enums.AuditStatusEnum; import cn.iocoder.yudao.module.crm.enums.AuditStatusEnum;
import cn.iocoder.yudao.module.crm.service.contract.ContractService; import cn.iocoder.yudao.module.crm.service.contract.ContractService;
import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService; import cn.iocoder.yudao.module.crm.service.customer.CrmCustomerService;
@ -36,21 +35,21 @@ import static cn.iocoder.yudao.module.crm.enums.ErrorCodeConstants.*;
*/ */
@Service @Service
@Validated @Validated
public class ReceivableServiceImpl implements ReceivableService { public class CrmReceivableServiceImpl implements CrmReceivableService {
@Resource @Resource
private ReceivableMapper receivableMapper; private CrmReceivableMapper crmReceivableMapper;
@Resource @Resource
private ContractService contractService; private ContractService contractService;
@Resource @Resource
private CrmCustomerService crmCustomerService; private CrmCustomerService crmCustomerService;
@Resource @Resource
private ReceivablePlanService receivablePlanService; private CrmReceivablePlanService crmReceivablePlanService;
@Override @Override
public Long createReceivable(ReceivableCreateReqVO createReqVO) { public Long createReceivable(CrmReceivableCreateReqVO createReqVO) {
// 插入 // 插入
ReceivableDO receivable = ReceivableConvert.INSTANCE.convert(createReqVO); CrmReceivableDO receivable = CrmReceivableConvert.INSTANCE.convert(createReqVO);
if (ObjectUtil.isNull(receivable.getStatus())){ if (ObjectUtil.isNull(receivable.getStatus())){
receivable.setStatus(CommonStatusEnum.ENABLE.getStatus()); receivable.setStatus(CommonStatusEnum.ENABLE.getStatus());
} }
@ -61,12 +60,12 @@ public class ReceivableServiceImpl implements ReceivableService {
//校验 //校验
checkReceivable(receivable); checkReceivable(receivable);
receivableMapper.insert(receivable); crmReceivableMapper.insert(receivable);
// 返回 // 返回
return receivable.getId(); return receivable.getId();
} }
private void checkReceivable(ReceivableDO receivable) { private void checkReceivable(CrmReceivableDO receivable) {
if(ObjectUtil.isNull(receivable.getContractId())){ if(ObjectUtil.isNull(receivable.getContractId())){
throw exception(CONTRACT_NOT_EXISTS); throw exception(CONTRACT_NOT_EXISTS);
@ -82,7 +81,7 @@ public class ReceivableServiceImpl implements ReceivableService {
throw exception(CUSTOMER_NOT_EXISTS); throw exception(CUSTOMER_NOT_EXISTS);
} }
ReceivablePlanDO receivablePlan = receivablePlanService.getReceivablePlan(receivable.getPlanId()); CrmReceivablePlanDO receivablePlan = crmReceivablePlanService.getReceivablePlan(receivable.getPlanId());
if(ObjectUtil.isNull(receivablePlan)){ if(ObjectUtil.isNull(receivablePlan)){
throw exception(RECEIVABLE_PLAN_NOT_EXISTS); throw exception(RECEIVABLE_PLAN_NOT_EXISTS);
} }
@ -90,13 +89,13 @@ public class ReceivableServiceImpl implements ReceivableService {
} }
@Override @Override
public void updateReceivable(ReceivableUpdateReqVO updateReqVO) { public void updateReceivable(CrmReceivableUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validateReceivableExists(updateReqVO.getId()); validateReceivableExists(updateReqVO.getId());
// 更新 // 更新
ReceivableDO updateObj = ReceivableConvert.INSTANCE.convert(updateReqVO); CrmReceivableDO updateObj = CrmReceivableConvert.INSTANCE.convert(updateReqVO);
receivableMapper.updateById(updateObj); crmReceivableMapper.updateById(updateObj);
} }
@Override @Override
@ -104,36 +103,36 @@ public class ReceivableServiceImpl implements ReceivableService {
// 校验存在 // 校验存在
validateReceivableExists(id); validateReceivableExists(id);
// 删除 // 删除
receivableMapper.deleteById(id); crmReceivableMapper.deleteById(id);
} }
private void validateReceivableExists(Long id) { private void validateReceivableExists(Long id) {
if (receivableMapper.selectById(id) == null) { if (crmReceivableMapper.selectById(id) == null) {
throw exception(RECEIVABLE_NOT_EXISTS); throw exception(RECEIVABLE_NOT_EXISTS);
} }
} }
@Override @Override
public ReceivableDO getReceivable(Long id) { public CrmReceivableDO getReceivable(Long id) {
return receivableMapper.selectById(id); return crmReceivableMapper.selectById(id);
} }
@Override @Override
public List<ReceivableDO> getReceivableList(Collection<Long> ids) { public List<CrmReceivableDO> getReceivableList(Collection<Long> ids) {
if (CollUtil.isEmpty(ids)) { if (CollUtil.isEmpty(ids)) {
return ListUtil.empty(); return ListUtil.empty();
} }
return receivableMapper.selectBatchIds(ids); return crmReceivableMapper.selectBatchIds(ids);
} }
@Override @Override
public PageResult<ReceivableDO> getReceivablePage(ReceivablePageReqVO pageReqVO) { public PageResult<CrmReceivableDO> getReceivablePage(CrmReceivablePageReqVO pageReqVO) {
return receivableMapper.selectPage(pageReqVO); return crmReceivableMapper.selectPage(pageReqVO);
} }
@Override @Override
public List<ReceivableDO> getReceivableList(ReceivableExportReqVO exportReqVO) { public List<CrmReceivableDO> getReceivableList(CrmReceivableExportReqVO exportReqVO) {
return receivableMapper.selectList(exportReqVO); return crmReceivableMapper.selectList(exportReqVO);
} }
} }

2
yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/receivable/ReceivableMapper.xml → yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/receivable/CrmReceivableMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.receivable.ReceivableMapper"> <mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivableMapper">
<!-- <!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

2
yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/receivable/ReceivablePlanMapper.xml → yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/receivable/CrmReceivablePlanMapper.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.receivable.ReceivablePlanMapper"> <mapper namespace="cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivablePlanMapper">
<!-- <!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。 一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。

102
yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/ReceivablePlanServiceImplTest.java → yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivablePlanServiceImplTest.java
View File

@ -2,12 +2,12 @@ package cn.iocoder.yudao.module.crm.service.receivable;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanCreateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanCreateReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanExportReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanExportReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanPageReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanPageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePlanUpdateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePlanUpdateReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivablePlanDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivablePlanDO;
import cn.iocoder.yudao.module.crm.dal.mysql.receivable.ReceivablePlanMapper; import cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivablePlanMapper;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@ -26,54 +26,54 @@ import static org.junit.jupiter.api.Assertions.*;
// TODO 芋艿：后续，需要补充测试用例 // TODO 芋艿：后续，需要补充测试用例
/** /**
* {@link ReceivablePlanServiceImpl} 的单元测试类 * {@link CrmReceivablePlanServiceImpl} 的单元测试类
* *
* @author 芋道源码 * @author 芋道源码
*/ */
@Import(ReceivablePlanServiceImpl.class) @Import(CrmReceivablePlanServiceImpl.class)
public class ReceivablePlanServiceImplTest extends BaseDbUnitTest { public class CrmCrmReceivablePlanServiceImplTest extends BaseDbUnitTest {
@Resource @Resource
private ReceivablePlanServiceImpl receivablePlanService; private CrmReceivablePlanServiceImpl receivablePlanService;
@Resource @Resource
private ReceivablePlanMapper receivablePlanMapper; private CrmReceivablePlanMapper crmReceivablePlanMapper;
@Test @Test
public void testCreateReceivablePlan_success() { public void testCreateReceivablePlan_success() {
// 准备参数 // 准备参数
ReceivablePlanCreateReqVO reqVO = randomPojo(ReceivablePlanCreateReqVO.class); CrmReceivablePlanCreateReqVO reqVO = randomPojo(CrmReceivablePlanCreateReqVO.class);
// 调用 // 调用
Long receivablePlanId = receivablePlanService.createReceivablePlan(reqVO); Long receivablePlanId = receivablePlanService.createReceivablePlan(reqVO);
// 断言 // 断言
assertNotNull(receivablePlanId); assertNotNull(receivablePlanId);
// 校验记录的属性是否正确 // 校验记录的属性是否正确
ReceivablePlanDO receivablePlan = receivablePlanMapper.selectById(receivablePlanId); CrmReceivablePlanDO receivablePlan = crmReceivablePlanMapper.selectById(receivablePlanId);
assertPojoEquals(reqVO, receivablePlan); assertPojoEquals(reqVO, receivablePlan);
} }
@Test @Test
public void testUpdateReceivablePlan_success() { public void testUpdateReceivablePlan_success() {
// mock 数据 // mock 数据
ReceivablePlanDO dbReceivablePlan = randomPojo(ReceivablePlanDO.class); CrmReceivablePlanDO dbReceivablePlan = randomPojo(CrmReceivablePlanDO.class);
receivablePlanMapper.insert(dbReceivablePlan);// @Sql: 先插入出一条存在的数据 crmReceivablePlanMapper.insert(dbReceivablePlan);// @Sql: 先插入出一条存在的数据
// 准备参数 // 准备参数
ReceivablePlanUpdateReqVO reqVO = randomPojo(ReceivablePlanUpdateReqVO.class, o -> { CrmReceivablePlanUpdateReqVO reqVO = randomPojo(CrmReceivablePlanUpdateReqVO.class, o -> {
o.setId(dbReceivablePlan.getId()); // 设置更新的 ID o.setId(dbReceivablePlan.getId()); // 设置更新的 ID
}); });
// 调用 // 调用
receivablePlanService.updateReceivablePlan(reqVO); receivablePlanService.updateReceivablePlan(reqVO);
// 校验是否更新正确 // 校验是否更新正确
ReceivablePlanDO receivablePlan = receivablePlanMapper.selectById(reqVO.getId()); // 获取最新的 CrmReceivablePlanDO receivablePlan = crmReceivablePlanMapper.selectById(reqVO.getId()); // 获取最新的
assertPojoEquals(reqVO, receivablePlan); assertPojoEquals(reqVO, receivablePlan);
} }
@Test @Test
public void testUpdateReceivablePlan_notExists() { public void testUpdateReceivablePlan_notExists() {
// 准备参数 // 准备参数
ReceivablePlanUpdateReqVO reqVO = randomPojo(ReceivablePlanUpdateReqVO.class); CrmReceivablePlanUpdateReqVO reqVO = randomPojo(CrmReceivablePlanUpdateReqVO.class);
// 调用, 并断言异常 // 调用, 并断言异常
assertServiceException(() -> receivablePlanService.updateReceivablePlan(reqVO), RECEIVABLE_PLAN_NOT_EXISTS); assertServiceException(() -> receivablePlanService.updateReceivablePlan(reqVO), RECEIVABLE_PLAN_NOT_EXISTS);
@ -82,15 +82,15 @@ public class ReceivablePlanServiceImplTest extends BaseDbUnitTest {
@Test @Test
public void testDeleteReceivablePlan_success() { public void testDeleteReceivablePlan_success() {
// mock 数据 // mock 数据
ReceivablePlanDO dbReceivablePlan = randomPojo(ReceivablePlanDO.class); CrmReceivablePlanDO dbReceivablePlan = randomPojo(CrmReceivablePlanDO.class);
receivablePlanMapper.insert(dbReceivablePlan);// @Sql: 先插入出一条存在的数据 crmReceivablePlanMapper.insert(dbReceivablePlan);// @Sql: 先插入出一条存在的数据
// 准备参数 // 准备参数
Long id = dbReceivablePlan.getId(); Long id = dbReceivablePlan.getId();
// 调用 // 调用
receivablePlanService.deleteReceivablePlan(id); receivablePlanService.deleteReceivablePlan(id);
// 校验数据不存在了 // 校验数据不存在了
assertNull(receivablePlanMapper.selectById(id)); assertNull(crmReceivablePlanMapper.selectById(id));
} }
@Test @Test
@ -106,7 +106,7 @@ public class ReceivablePlanServiceImplTest extends BaseDbUnitTest {
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetReceivablePlanPage() { public void testGetReceivablePlanPage() {
// mock 数据 // mock 数据
ReceivablePlanDO dbReceivablePlan = randomPojo(ReceivablePlanDO.class, o -> { // 等会查询到 CrmReceivablePlanDO dbReceivablePlan = randomPojo(CrmReceivablePlanDO.class, o -> { // 等会查询到
o.setPeriod(null); o.setPeriod(null);
o.setStatus(null); o.setStatus(null);
o.setCheckStatus(null); o.setCheckStatus(null);
@ -119,31 +119,31 @@ public class ReceivablePlanServiceImplTest extends BaseDbUnitTest {
o.setRemark(null); o.setRemark(null);
o.setCreateTime(null); o.setCreateTime(null);
}); });
receivablePlanMapper.insert(dbReceivablePlan); crmReceivablePlanMapper.insert(dbReceivablePlan);
// 测试 Period 不匹配 // 测试 Period 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setPeriod(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setPeriod(null)));
// 测试 status 不匹配 // 测试 status 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setStatus(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setStatus(null)));
// 测试 checkStatus 不匹配 // 测试 checkStatus 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCheckStatus(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCheckStatus(null)));
// 测试 returnTime 不匹配 // 测试 returnTime 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setReturnTime(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setReturnTime(null)));
// 测试 remindDays 不匹配 // 测试 remindDays 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindDays(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindDays(null)));
// 测试 remindTime 不匹配 // 测试 remindTime 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindTime(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindTime(null)));
// 测试 customerId 不匹配 // 测试 customerId 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCustomerId(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCustomerId(null)));
// 测试 contractId 不匹配 // 测试 contractId 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setContractId(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setContractId(null)));
// 测试 ownerUserId 不匹配 // 测试 ownerUserId 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setOwnerUserId(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setOwnerUserId(null)));
// 测试 remark 不匹配 // 测试 remark 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemark(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemark(null)));
// 测试 createTime 不匹配 // 测试 createTime 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCreateTime(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCreateTime(null)));
// 准备参数 // 准备参数
ReceivablePlanPageReqVO reqVO = new ReceivablePlanPageReqVO(); CrmReceivablePlanPageReqVO reqVO = new CrmReceivablePlanPageReqVO();
reqVO.setStatus(null); reqVO.setStatus(null);
reqVO.setCheckStatus(null); reqVO.setCheckStatus(null);
reqVO.setReturnTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setReturnTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
@ -154,7 +154,7 @@ public class ReceivablePlanServiceImplTest extends BaseDbUnitTest {
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用 // 调用
PageResult<ReceivablePlanDO> pageResult = receivablePlanService.getReceivablePlanPage(reqVO); PageResult<CrmReceivablePlanDO> pageResult = receivablePlanService.getReceivablePlanPage(reqVO);
// 断言 // 断言
assertEquals(1, pageResult.getTotal()); assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size()); assertEquals(1, pageResult.getList().size());
@ -165,7 +165,7 @@ public class ReceivablePlanServiceImplTest extends BaseDbUnitTest {
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetReceivablePlanList() { public void testGetReceivablePlanList() {
// mock 数据 // mock 数据
ReceivablePlanDO dbReceivablePlan = randomPojo(ReceivablePlanDO.class, o -> { // 等会查询到 CrmReceivablePlanDO dbReceivablePlan = randomPojo(CrmReceivablePlanDO.class, o -> { // 等会查询到
o.setPeriod(null); o.setPeriod(null);
o.setStatus(null); o.setStatus(null);
o.setCheckStatus(null); o.setCheckStatus(null);
@ -178,31 +178,31 @@ public class ReceivablePlanServiceImplTest extends BaseDbUnitTest {
o.setRemark(null); o.setRemark(null);
o.setCreateTime(null); o.setCreateTime(null);
}); });
receivablePlanMapper.insert(dbReceivablePlan); crmReceivablePlanMapper.insert(dbReceivablePlan);
// 测试 Period 不匹配 // 测试 Period 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setPeriod(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setPeriod(null)));
// 测试 status 不匹配 // 测试 status 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setStatus(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setStatus(null)));
// 测试 checkStatus 不匹配 // 测试 checkStatus 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCheckStatus(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCheckStatus(null)));
// 测试 returnTime 不匹配 // 测试 returnTime 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setReturnTime(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setReturnTime(null)));
// 测试 remindDays 不匹配 // 测试 remindDays 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindDays(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindDays(null)));
// 测试 remindTime 不匹配 // 测试 remindTime 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindTime(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemindTime(null)));
// 测试 customerId 不匹配 // 测试 customerId 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCustomerId(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCustomerId(null)));
// 测试 contractId 不匹配 // 测试 contractId 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setContractId(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setContractId(null)));
// 测试 ownerUserId 不匹配 // 测试 ownerUserId 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setOwnerUserId(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setOwnerUserId(null)));
// 测试 remark 不匹配 // 测试 remark 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemark(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setRemark(null)));
// 测试 createTime 不匹配 // 测试 createTime 不匹配
receivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCreateTime(null))); crmReceivablePlanMapper.insert(cloneIgnoreId(dbReceivablePlan, o -> o.setCreateTime(null)));
// 准备参数 // 准备参数
ReceivablePlanExportReqVO reqVO = new ReceivablePlanExportReqVO(); CrmReceivablePlanExportReqVO reqVO = new CrmReceivablePlanExportReqVO();
reqVO.setPeriod(null); reqVO.setPeriod(null);
reqVO.setStatus(null); reqVO.setStatus(null);
reqVO.setCheckStatus(null); reqVO.setCheckStatus(null);
@ -216,7 +216,7 @@ public class ReceivablePlanServiceImplTest extends BaseDbUnitTest {
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用 // 调用
List<ReceivablePlanDO> list = receivablePlanService.getReceivablePlanList(reqVO); List<CrmReceivablePlanDO> list = receivablePlanService.getReceivablePlanList(reqVO);
// 断言 // 断言
assertEquals(1, list.size()); assertEquals(1, list.size());
assertPojoEquals(dbReceivablePlan, list.get(0)); assertPojoEquals(dbReceivablePlan, list.get(0));

126
yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/ReceivableServiceImplTest.java → yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/receivable/CrmCrmReceivableServiceImplTest.java
View File

@ -2,12 +2,12 @@ package cn.iocoder.yudao.module.crm.service.receivable;
import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivableCreateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivableCreateReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivableExportReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivableExportReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivablePageReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivablePageReqVO;
import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.ReceivableUpdateReqVO; import cn.iocoder.yudao.module.crm.controller.admin.receivable.vo.CrmReceivableUpdateReqVO;
import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.ReceivableDO; import cn.iocoder.yudao.module.crm.dal.dataobject.receivable.CrmReceivableDO;
import cn.iocoder.yudao.module.crm.dal.mysql.receivable.ReceivableMapper; import cn.iocoder.yudao.module.crm.dal.mysql.receivable.CrmReceivableMapper;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
@ -26,54 +26,54 @@ import static org.junit.jupiter.api.Assertions.*;
// TODO 芋艿：等实现完，在校验下； // TODO 芋艿：等实现完，在校验下；
/** /**
* {@link ReceivableServiceImpl} 的单元测试类 * {@link CrmReceivableServiceImpl} 的单元测试类
* *
* @author 赤焰 * @author 赤焰
*/ */
@Import(ReceivableServiceImpl.class) @Import(CrmReceivableServiceImpl.class)
public class ReceivableServiceImplTest extends BaseDbUnitTest { public class CrmCrmReceivableServiceImplTest extends BaseDbUnitTest {
@Resource @Resource
private ReceivableServiceImpl receivableService; private CrmReceivableServiceImpl receivableService;
@Resource @Resource
private ReceivableMapper receivableMapper; private CrmReceivableMapper crmReceivableMapper;
@Test @Test
public void testCreateReceivable_success() { public void testCreateReceivable_success() {
// 准备参数 // 准备参数
ReceivableCreateReqVO reqVO = randomPojo(ReceivableCreateReqVO.class); CrmReceivableCreateReqVO reqVO = randomPojo(CrmReceivableCreateReqVO.class);
// 调用 // 调用
Long receivableId = receivableService.createReceivable(reqVO); Long receivableId = receivableService.createReceivable(reqVO);
// 断言 // 断言
assertNotNull(receivableId); assertNotNull(receivableId);
// 校验记录的属性是否正确 // 校验记录的属性是否正确
ReceivableDO receivable = receivableMapper.selectById(receivableId); CrmReceivableDO receivable = crmReceivableMapper.selectById(receivableId);
assertPojoEquals(reqVO, receivable); assertPojoEquals(reqVO, receivable);
} }
@Test @Test
public void testUpdateReceivable_success() { public void testUpdateReceivable_success() {
// mock 数据 // mock 数据
ReceivableDO dbReceivable = randomPojo(ReceivableDO.class); CrmReceivableDO dbReceivable = randomPojo(CrmReceivableDO.class);
receivableMapper.insert(dbReceivable);// @Sql: 先插入出一条存在的数据 crmReceivableMapper.insert(dbReceivable);// @Sql: 先插入出一条存在的数据
// 准备参数 // 准备参数
ReceivableUpdateReqVO reqVO = randomPojo(ReceivableUpdateReqVO.class, o -> { CrmReceivableUpdateReqVO reqVO = randomPojo(CrmReceivableUpdateReqVO.class, o -> {
o.setId(dbReceivable.getId()); // 设置更新的 ID o.setId(dbReceivable.getId()); // 设置更新的 ID
}); });
// 调用 // 调用
receivableService.updateReceivable(reqVO); receivableService.updateReceivable(reqVO);
// 校验是否更新正确 // 校验是否更新正确
ReceivableDO receivable = receivableMapper.selectById(reqVO.getId()); // 获取最新的 CrmReceivableDO receivable = crmReceivableMapper.selectById(reqVO.getId()); // 获取最新的
assertPojoEquals(reqVO, receivable); assertPojoEquals(reqVO, receivable);
} }
@Test @Test
public void testUpdateReceivable_notExists() { public void testUpdateReceivable_notExists() {
// 准备参数 // 准备参数
ReceivableUpdateReqVO reqVO = randomPojo(ReceivableUpdateReqVO.class); CrmReceivableUpdateReqVO reqVO = randomPojo(CrmReceivableUpdateReqVO.class);
// 调用, 并断言异常 // 调用, 并断言异常
assertServiceException(() -> receivableService.updateReceivable(reqVO), RECEIVABLE_NOT_EXISTS); assertServiceException(() -> receivableService.updateReceivable(reqVO), RECEIVABLE_NOT_EXISTS);
@ -82,15 +82,15 @@ public class ReceivableServiceImplTest extends BaseDbUnitTest {
@Test @Test
public void testDeleteReceivable_success() { public void testDeleteReceivable_success() {
// mock 数据 // mock 数据
ReceivableDO dbReceivable = randomPojo(ReceivableDO.class); CrmReceivableDO dbReceivable = randomPojo(CrmReceivableDO.class);
receivableMapper.insert(dbReceivable);// @Sql: 先插入出一条存在的数据 crmReceivableMapper.insert(dbReceivable);// @Sql: 先插入出一条存在的数据
// 准备参数 // 准备参数
Long id = dbReceivable.getId(); Long id = dbReceivable.getId();
// 调用 // 调用
receivableService.deleteReceivable(id); receivableService.deleteReceivable(id);
// 校验数据不存在了 // 校验数据不存在了
assertNull(receivableMapper.selectById(id)); assertNull(crmReceivableMapper.selectById(id));
} }
@Test @Test
@ -106,7 +106,7 @@ public class ReceivableServiceImplTest extends BaseDbUnitTest {
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetReceivablePage() { public void testGetReceivablePage() {
// mock 数据 // mock 数据
ReceivableDO dbReceivable = randomPojo(ReceivableDO.class, o -> { // 等会查询到 CrmReceivableDO dbReceivable = randomPojo(CrmReceivableDO.class, o -> { // 等会查询到
o.setNo(null); o.setNo(null);
o.setPlanId(null); o.setPlanId(null);
o.setCustomerId(null); o.setCustomerId(null);
@ -125,43 +125,43 @@ public class ReceivableServiceImplTest extends BaseDbUnitTest {
o.setRemark(null); o.setRemark(null);
o.setCreateTime(null); o.setCreateTime(null);
}); });
receivableMapper.insert(dbReceivable); crmReceivableMapper.insert(dbReceivable);
// 测试 no 不匹配 // 测试 no 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setNo(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setNo(null)));
// 测试 planId 不匹配 // 测试 planId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPlanId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPlanId(null)));
// 测试 customerId 不匹配 // 测试 customerId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCustomerId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCustomerId(null)));
// 测试 contractId 不匹配 // 测试 contractId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setContractId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setContractId(null)));
// 测试 checkStatus 不匹配 // 测试 checkStatus 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCheckStatus(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCheckStatus(null)));
// 测试 processInstanceId 不匹配 // 测试 processInstanceId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setProcessInstanceId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setProcessInstanceId(null)));
// 测试 returnTime 不匹配 // 测试 returnTime 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnTime(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnTime(null)));
// 测试 returnType 不匹配 // 测试 returnType 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnType(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnType(null)));
// 测试 price 不匹配 // 测试 price 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPrice(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPrice(null)));
// 测试 ownerUserId 不匹配 // 测试 ownerUserId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setOwnerUserId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setOwnerUserId(null)));
// 测试 batchId 不匹配 // 测试 batchId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setBatchId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setBatchId(null)));
// 测试 sort 不匹配 // 测试 sort 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setSort(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setSort(null)));
// 测试 dataScope 不匹配 // 测试 dataScope 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScope(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScope(null)));
// 测试 dataScopeDeptIds 不匹配 // 测试 dataScopeDeptIds 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScopeDeptIds(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScopeDeptIds(null)));
// 测试 status 不匹配 // 测试 status 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setStatus(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setStatus(null)));
// 测试 remark 不匹配 // 测试 remark 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setRemark(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setRemark(null)));
// 测试 createTime 不匹配 // 测试 createTime 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCreateTime(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCreateTime(null)));
// 准备参数 // 准备参数
ReceivablePageReqVO reqVO = new ReceivablePageReqVO(); CrmReceivablePageReqVO reqVO = new CrmReceivablePageReqVO();
reqVO.setNo(null); reqVO.setNo(null);
reqVO.setPlanId(null); reqVO.setPlanId(null);
reqVO.setCustomerId(null); reqVO.setCustomerId(null);
@ -175,7 +175,7 @@ public class ReceivableServiceImplTest extends BaseDbUnitTest {
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用 // 调用
PageResult<ReceivableDO> pageResult = receivableService.getReceivablePage(reqVO); PageResult<CrmReceivableDO> pageResult = receivableService.getReceivablePage(reqVO);
// 断言 // 断言
assertEquals(1, pageResult.getTotal()); assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size()); assertEquals(1, pageResult.getList().size());
@ -186,7 +186,7 @@ public class ReceivableServiceImplTest extends BaseDbUnitTest {
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解 @Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetReceivableList() { public void testGetReceivableList() {
// mock 数据 // mock 数据
ReceivableDO dbReceivable = randomPojo(ReceivableDO.class, o -> { // 等会查询到 CrmReceivableDO dbReceivable = randomPojo(CrmReceivableDO.class, o -> { // 等会查询到
o.setNo(null); o.setNo(null);
o.setPlanId(null); o.setPlanId(null);
o.setCustomerId(null); o.setCustomerId(null);
@ -205,43 +205,43 @@ public class ReceivableServiceImplTest extends BaseDbUnitTest {
o.setRemark(null); o.setRemark(null);
o.setCreateTime(null); o.setCreateTime(null);
}); });
receivableMapper.insert(dbReceivable); crmReceivableMapper.insert(dbReceivable);
// 测试 no 不匹配 // 测试 no 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setNo(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setNo(null)));
// 测试 planId 不匹配 // 测试 planId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPlanId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPlanId(null)));
// 测试 customerId 不匹配 // 测试 customerId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCustomerId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCustomerId(null)));
// 测试 contractId 不匹配 // 测试 contractId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setContractId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setContractId(null)));
// 测试 checkStatus 不匹配 // 测试 checkStatus 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCheckStatus(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCheckStatus(null)));
// 测试 processInstanceId 不匹配 // 测试 processInstanceId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setProcessInstanceId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setProcessInstanceId(null)));
// 测试 returnTime 不匹配 // 测试 returnTime 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnTime(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnTime(null)));
// 测试 returnType 不匹配 // 测试 returnType 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnType(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setReturnType(null)));
// 测试 price 不匹配 // 测试 price 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPrice(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setPrice(null)));
// 测试 ownerUserId 不匹配 // 测试 ownerUserId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setOwnerUserId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setOwnerUserId(null)));
// 测试 batchId 不匹配 // 测试 batchId 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setBatchId(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setBatchId(null)));
// 测试 sort 不匹配 // 测试 sort 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setSort(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setSort(null)));
// 测试 dataScope 不匹配 // 测试 dataScope 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScope(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScope(null)));
// 测试 dataScopeDeptIds 不匹配 // 测试 dataScopeDeptIds 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScopeDeptIds(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setDataScopeDeptIds(null)));
// 测试 status 不匹配 // 测试 status 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setStatus(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setStatus(null)));
// 测试 remark 不匹配 // 测试 remark 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setRemark(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setRemark(null)));
// 测试 createTime 不匹配 // 测试 createTime 不匹配
receivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCreateTime(null))); crmReceivableMapper.insert(cloneIgnoreId(dbReceivable, o -> o.setCreateTime(null)));
// 准备参数 // 准备参数
ReceivableExportReqVO reqVO = new ReceivableExportReqVO(); CrmReceivableExportReqVO reqVO = new CrmReceivableExportReqVO();
reqVO.setNo(null); reqVO.setNo(null);
reqVO.setPlanId(null); reqVO.setPlanId(null);
reqVO.setCustomerId(null); reqVO.setCustomerId(null);
@ -257,7 +257,7 @@ public class ReceivableServiceImplTest extends BaseDbUnitTest {
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用 // 调用
List<ReceivableDO> list = receivableService.getReceivableList(reqVO); List<CrmReceivableDO> list = receivableService.getReceivableList(reqVO);
// 断言 // 断言
assertEquals(1, list.size()); assertEquals(1, list.size());
assertPojoEquals(dbReceivable, list.get(0)); assertPojoEquals(dbReceivable, list.get(0));