feat: ERP升级 (67e60689) | Commits | canrd-outside / order-erp

Commit 67e60689aa2d25c9efcafb0302f26b9391d64eb6

Authored by 谢茂盛 2024-08-07 14:04:57 +0800

feat: ERP升级

1、回退财务代码

Inline Side-by-side

Showing 44 changed files with 0 additions and 3120 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 44 of 55 files are displayed.

sql/dml_erp_bill_v2.sql deleted 100644 → 0

View file @8e2b347

1	-DROP TABLE IF EXISTS `invoice_bill_order`;
2	-CREATE TABLE `invoice_bill_order` (
3	- `id` bigint NOT NULL AUTO_INCREMENT,
4	- `invoice_no` varchar(64) NOT NULL COMMENT '发票单号',
5	- `bg_url` varchar(256) NOT NULL COMMENT '报关单url地址',
6	- `back_refund_date` varchar(64) NOT null COMMENT '必须回款日期',
7	- `deduct_amount` decimal(20,6) DEFAULT NULL COMMENT '发生扣款金额',
8	- `deduct_url` varchar(256) NOT NULL COMMENT '扣款单url地址',
9	- `actual_receivable_amount` decimal(20,6) DEFAULT NULL COMMENT '实际应收金额',
10	- `actual_payed_amount1` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额1',
11	- `actual_payed_amount2` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额2',
12	- `actual_payed_amount3` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额3',
13	- `other_amount` decimal(20,6) DEFAULT NULL COMMENT '其他费用金额',
14	- `status` INT NOT NULL COMMENT '总经理审核状态 0：待审核、1：审核通过，2：审核驳回',
15	- `enable_flag` INT NOT NULL COMMENT '是否可用 10-可用 20-删除',
16	- `create_time` DATETIME NOT NULL COMMENT '创建时间',
17	- `create_by` varchar(64) NOT NULL COMMENT '创建人',
18	- `modify_time` DATETIME DEFAULT NULL COMMENT '修改时间',
19	- `modify_by` varchar(64) DEFAULT NULL COMMENT '修改人',
20	- `version` INT DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
21	- PRIMARY KEY (`id`)
22	-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应收款账单表';
23	-
24	-DROP TABLE IF EXISTS `invoice_bill_mapping`;
25	-CREATE TABLE `invoice_bill_mapping` (
26	- `id` bigint NOT NULL AUTO_INCREMENT,
27	- `invoice_no` varchar(64) NOT NULL COMMENT '发票单号',
28	- `invoice_bill_id` bigint DEFAULT '0' COMMENT 'invoice账单id',
29	- `order_id` bigint DEFAULT '0' COMMENT '订单id',
30	- `enable_flag` INT NOT NULL COMMENT '是否可用 10-可用 20-删除',
31	- `create_time` DATETIME NOT NULL COMMENT '创建时间',
32	- `create_by` varchar(64) NOT NULL COMMENT '创建人',
33	- `modify_time` DATETIME DEFAULT NULL COMMENT '修改时间',
34	- `modify_by` varchar(64) DEFAULT NULL COMMENT '修改人',
35	- `version` INT DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
36	- PRIMARY KEY (`id`)
37	-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应收款账单关联订单映射表';
38	-
39	-
40	-DROP TABLE IF EXISTS `produce_payment_check_bill_order`;
41	-CREATE TABLE `produce_payment_check_bill_order` (
42	- `id` bigint NOT NULL AUTO_INCREMENT,
43	- `check_no` varchar(64) NOT NULL COMMENT '生产科对账单',
44	- `invoice_url` varchar(256) NOT NULL COMMENT '发票url地址',
45	- `deduct_pdf_url` varchar(256) NOT NULL COMMENT '扣款单url地址',
46	- `payed_date` varchar(64) NOT null COMMENT '生产科应付款日期',
47	- `deduct_dept` varchar(64) NOT null COMMENT '生产科扣款责任部门',
48	- `deduct_amount` decimal(20,6) DEFAULT NULL COMMENT '生产科扣款金额',
49	- `actual_payed_amount` decimal(20,6) DEFAULT NULL COMMENT '实际应付金额',
50	- `status` INT NOT NULL COMMENT '总经理审核状态 0：待审核、1：审核通过，2：审核驳回',
51	- `enable_flag` INT NOT NULL COMMENT '是否可用 10-可用 20-删除',
52	- `create_time` DATETIME NOT NULL COMMENT '创建时间',
53	- `create_by` varchar(64) NOT NULL COMMENT '创建人',
54	- `modify_time` DATETIME DEFAULT NULL COMMENT '修改时间',
55	- `modify_by` varchar(64) DEFAULT NULL COMMENT '修改人',
56	- `version` INT DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
57	- PRIMARY KEY (`id`)
58	-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产科对账单应收账单';
59	-
60	-DROP TABLE IF EXISTS `check_bill_mapping`;
61	-CREATE TABLE `check_bill_mapping` (
62	- `id` bigint NOT NULL AUTO_INCREMENT,
63	- `check_no` varchar(64) NOT NULL COMMENT '生产科对账单号',
64	- `check_bill_id` bigint DEFAULT '0' COMMENT 'check账单id',
65	- `order_id` bigint DEFAULT '0' COMMENT '订单id',
66	- `enable_flag` INT NOT NULL COMMENT '是否可用 10-可用 20-删除',
67	- `create_time` DATETIME NOT NULL COMMENT '创建时间',
68	- `create_by` varchar(64) NOT NULL COMMENT '创建人',
69	- `modify_time` DATETIME DEFAULT NULL COMMENT '修改时间',
70	- `modify_by` varchar(64) DEFAULT NULL COMMENT '修改人',
71	- `version` INT DEFAULT NULL COMMENT '版本号--乐观锁预留字段',
72	- PRIMARY KEY (`id`)
73	-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='生产科对账单应收账单映射表';
74	-

src/main/java/com/order/erp/controller/InvoiceBillOrderController.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.controller;
2	-
3	-import com.order.erp.common.constant.ServerResult;
4	-import com.order.erp.common.jsr303.OperateGroup;
5	-import com.order.erp.domain.vo.order.*;
6	-import com.order.erp.service.order.InvoiceBillOrderService;
7	-import org.springframework.validation.annotation.Validated;
8	-import org.springframework.web.bind.annotation.PostMapping;
9	-import org.springframework.web.bind.annotation.RequestBody;
10	-import org.springframework.web.bind.annotation.RequestMapping;
11	-import org.springframework.web.bind.annotation.RestController;
12	-
13	-import javax.annotation.Resource;
14	-
15	-/**
16	- * 应收款账单表(InvoiceBillOrder)表控制层
17	- *
18	- * @author makejava
19	- * @since 2024-08-05 16:26:34
20	- */
21	-@RestController
22	-@RequestMapping("/order/erp/invoice_bill")
23	-public class InvoiceBillOrderController {
24	- /**
25	- * 服务对象
26	- */
27	- @Resource
28	- private InvoiceBillOrderService invoiceBillOrderService;
29	-
30	- /**
31	- * 分页查询
32	- *
33	- * @param invoiceBillOrderQueryVO 查询条件
34	- * @return 查询结果
35	- */
36	- @PostMapping("/list_by_page")
37	- public ServerResult listByPage(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
38	- return invoiceBillOrderService.listByPage(invoiceBillOrderQueryVO);
39	- }
40	-
41	- /**
42	- * 基础订单查询
43	- *
44	- * @param queryVO 查询条件
45	- * @return 查询结果
46	- */
47	- @PostMapping("/list_base_order_info_by")
48	- public ServerResult listBaseOrderInfoBy(@RequestBody @Validated({OperateGroup.List.class}) InvoiceBaseOrderQueryVO queryVO) {
49	- return invoiceBillOrderService.listBaseOrderInfoBy(queryVO);
50	- }
51	-
52	-
53	- /**
54	- * 创建invoice单据
55	- *
56	- * @param createVO 数据VO
57	- * @return 新增结果
58	- */
59	- @PostMapping("/create")
60	- public ServerResult create(@RequestBody InvoiceBillCreateVO createVO) {
61	- return invoiceBillOrderService.create(createVO);
62	- }
63	-
64	- /**
65	- * 更新扣款信息
66	- *
67	- * @param deductInfoVO 数据VO
68	- * @return 编辑结果
69	- */
70	- @PostMapping("/update_deduct_info")
71	- public ServerResult updateDeductInfo(@RequestBody InvoiceBillDeductInfoVO deductInfoVO) {
72	- return invoiceBillOrderService.updateDeductInfo(deductInfoVO);
73	- }
74	-
75	- /**
76	- * 更新其他金额信息
77	- *
78	- * @param amountInfoVO 数据VO
79	- * @return 编辑结果
80	- */
81	- @PostMapping("/update_amount_info")
82	- public ServerResult updateAmountInfo(@RequestBody InvoiceBillAmountInfoVO amountInfoVO) {
83	- return invoiceBillOrderService.updateAmountInfo(amountInfoVO);
84	- }
85	-
86	- /**
87	- * 删除数据
88	- *
89	- * @param invoiceBillOrderQueryVO 查询条件
90	- * @return 删除是否成功
91	- */
92	- @PostMapping("/delete_by_id")
93	- public ServerResult deleteById(@RequestBody InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
94	- return invoiceBillOrderService.deleteById(invoiceBillOrderQueryVO);
95	- }
96	-
97	-}
98	-

src/main/java/com/order/erp/controller/ProducePaymentCheckBillOrderController.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.controller;
2	-
3	-import com.order.erp.common.constant.ServerResult;
4	-import com.order.erp.common.jsr303.OperateGroup;
5	-import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderQueryVO;
6	-import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderVO;
7	-import com.order.erp.service.order.ProducePaymentCheckBillOrderService;
8	-import org.springframework.validation.annotation.Validated;
9	-import org.springframework.web.bind.annotation.PostMapping;
10	-import org.springframework.web.bind.annotation.RequestBody;
11	-import org.springframework.web.bind.annotation.RequestMapping;
12	-import org.springframework.web.bind.annotation.RestController;
13	-
14	-import javax.annotation.Resource;
15	-
16	-/**
17	- * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表控制层
18	- *
19	- * @author makejava
20	- * @since 2024-08-05 16:26:35
21	- */
22	-@RestController
23	-@RequestMapping("/order/erp/check_bill/")
24	-public class ProducePaymentCheckBillOrderController {
25	- /**
26	- * 服务对象
27	- */
28	- @Resource
29	- private ProducePaymentCheckBillOrderService producePaymentCheckBillOrderService;
30	-
31	- /**
32	- * 分页查询
33	- *
34	- * @param producePaymentCheckBillOrderQueryVO 查询条件
35	- * @return 查询结果
36	- */
37	- @PostMapping("/list")
38	- public ServerResult list(@RequestBody @Validated({OperateGroup.List.class}) ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
39	- return producePaymentCheckBillOrderService.list(producePaymentCheckBillOrderQueryVO);
40	- }
41	-
42	- /**
43	- * 通过主键查询单条数据
44	- *
45	- * @param producePaymentCheckBillOrderQueryVO 查询条件
46	- * @return 单条数据
47	- */
48	- @PostMapping("/query_by_id")
49	- public ServerResult queryById(@RequestBody ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
50	- return producePaymentCheckBillOrderService.queryById(producePaymentCheckBillOrderQueryVO);
51	- }
52	-
53	- /**
54	- * 新增数据
55	- *
56	- * @param producePaymentCheckBillOrderVO 数据VO
57	- * @return 新增结果
58	- */
59	- @PostMapping("/add")
60	- public ServerResult add(@RequestBody ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO) {
61	- return producePaymentCheckBillOrderService.add(producePaymentCheckBillOrderVO);
62	- }
63	-
64	- /**
65	- * 编辑数据
66	- *
67	- * @param producePaymentCheckBillOrderVO 数据VO
68	- * @return 编辑结果
69	- */
70	- @PostMapping("/edit")
71	- public ServerResult edit(@RequestBody ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO) {
72	- return producePaymentCheckBillOrderService.edit(producePaymentCheckBillOrderVO);
73	- }
74	-
75	- /**
76	- * 删除数据
77	- *
78	- * @param producePaymentCheckBillOrderQueryVO 查询条件
79	- * @return 删除是否成功
80	- */
81	- @PostMapping("/delete_by_id")
82	- public ServerResult deleteById(@RequestBody ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO) {
83	- return producePaymentCheckBillOrderService.deleteById(producePaymentCheckBillOrderQueryVO);
84	- }
85	-
86	-}
87	-

src/main/java/com/order/erp/domain/dto/order/CheckBillMappingDO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.dto.order;
2	-
3	-import com.baomidou.mybatisplus.annotation.TableName;
4	-import com.order.erp.domain.dto.BaseDO;
5	-import lombok.*;
6	-import lombok.experimental.SuperBuilder;
7	-
8	-import java.io.Serializable;
9	-
10	-/**
11	- * 生产科对账单应收账单映射表(CheckBillMapping)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:36
15	- */
16	-@TableName("check_bill_mapping")
17	-@Data
18	-@AllArgsConstructor
19	-@ToString
20	-@NoArgsConstructor
21	-@EqualsAndHashCode(callSuper = false)
22	-@SuperBuilder
23	-public class CheckBillMappingDO extends BaseDO implements Serializable {
24	- private static final long serialVersionUID = 199786248752278040L;
25	-
26	- private Long id;
27	- /**
28	- * 生产科对账单号
29	- */
30	- private String checkNo;
31	- /**
32	- * check账单id
33	- */
34	- private Long checkBillId;
35	- /**
36	- * 订单id
37	- */
38	- private Long orderId;
39	-
40	-}

src/main/java/com/order/erp/domain/dto/order/InvoiceBillMappingDO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.dto.order;
2	-
3	-import com.baomidou.mybatisplus.annotation.TableName;
4	-import com.order.erp.domain.dto.BaseDO;
5	-import lombok.*;
6	-import lombok.experimental.SuperBuilder;
7	-
8	-import java.io.Serializable;
9	-
10	-/**
11	- * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:36
15	- */
16	-@TableName("invoice_bill_mapping")
17	-@Data
18	-@AllArgsConstructor
19	-@ToString
20	-@NoArgsConstructor
21	-@EqualsAndHashCode(callSuper = false)
22	-@SuperBuilder
23	-public class InvoiceBillMappingDO extends BaseDO implements Serializable {
24	-
25	- private Long id;
26	- /**
27	- * 发票单号
28	- */
29	- private String invoiceNo;
30	- /**
31	- * invoice账单id
32	- */
33	- private Long invoiceBillId;
34	- /**
35	- * 订单id
36	- */
37	- private Long orderId;
38	-
39	-}

src/main/java/com/order/erp/domain/dto/order/InvoiceBillOrderDO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.dto.order;
2	-
3	-import com.baomidou.mybatisplus.annotation.TableName;
4	-import com.order.erp.domain.dto.BaseDO;
5	-import lombok.*;
6	-import lombok.experimental.SuperBuilder;
7	-
8	-import java.io.Serializable;
9	-import java.math.BigDecimal;
10	-
11	-/**
12	- * 应收款账单表(InvoiceBillOrder)实体类
13	- *
14	- * @author makejava
15	- * @since 2024-08-05 16:26:33
16	- */
17	-@TableName("invoice_bill_order")
18	-@Data
19	-@AllArgsConstructor
20	-@ToString
21	-@NoArgsConstructor
22	-@EqualsAndHashCode(callSuper = false)
23	-@SuperBuilder
24	-public class InvoiceBillOrderDO extends BaseDO implements Serializable {
25	-
26	- private Long id;
27	- /**
28	- * 发票单号
29	- */
30	- private String invoiceNo;
31	- /**
32	- * 报关单url地址
33	- */
34	- private String bgUrl;
35	- /**
36	- * 必须回款日期
37	- */
38	- private String backRefundDate;
39	- /**
40	- * 发生扣款金额
41	- */
42	- private BigDecimal deductAmount;
43	- /**
44	- * 扣款单url地址
45	- */
46	- private String deductUrl;
47	- /**
48	- * 实际应收金额
49	- */
50	- private BigDecimal actualReceivableAmount;
51	- /**
52	- * 实际应付金额1
53	- */
54	- private BigDecimal actualPayedAmount1;
55	- /**
56	- * 实际应付金额2
57	- */
58	- private BigDecimal actualPayedAmount2;
59	- /**
60	- * 实际应付金额3
61	- */
62	- private BigDecimal actualPayedAmount3;
63	- /**
64	- * 其他费用金额
65	- */
66	- private BigDecimal otherAmount;
67	- /**
68	- * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
69	- */
70	- private Integer status;
71	-
72	-}

src/main/java/com/order/erp/domain/dto/order/ProducePaymentCheckBillOrderDO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.dto.order;
2	-
3	-import com.baomidou.mybatisplus.annotation.TableName;
4	-import com.order.erp.domain.dto.BaseDO;
5	-import lombok.*;
6	-import lombok.experimental.SuperBuilder;
7	-
8	-import java.io.Serializable;
9	-
10	-/**
11	- * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:35
15	- */
16	-@TableName("produce_payment_check_bill_order")
17	-@Data
18	-@AllArgsConstructor
19	-@ToString
20	-@NoArgsConstructor
21	-@EqualsAndHashCode(callSuper = false)
22	-@SuperBuilder
23	-public class ProducePaymentCheckBillOrderDO extends BaseDO implements Serializable {
24	-
25	- private Long id;
26	- /**
27	- * 生产科对账单
28	- */
29	- private String checkNo;
30	- /**
31	- * 发票url地址
32	- */
33	- private String invoiceUrl;
34	- /**
35	- * 扣款单url地址
36	- */
37	- private String deductPdfUrl;
38	- /**
39	- * 生产科应付款日期
40	- */
41	- private String payedDate;
42	- /**
43	- * 生产科扣款责任部门
44	- */
45	- private String deductDept;
46	- /**
47	- * 生产科扣款金额
48	- */
49	- private Double deductAmount;
50	- /**
51	- * 实际应付金额
52	- */
53	- private Double actualPayedAmount;
54	- /**
55	- * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
56	- */
57	- private Integer status;
58	-
59	-}

src/main/java/com/order/erp/domain/vo/order/CheckBillMappingQueryVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import com.order.erp.domain.vo.BasePageVO;
4	-import lombok.*;
5	-import lombok.experimental.SuperBuilder;
6	-
7	-import java.io.Serializable;
8	-import java.util.List;
9	-
10	-/**
11	- * 生产科对账单应收账单映射表(CheckBillMapping)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:37
15	- */
16	-@Data
17	-@AllArgsConstructor
18	-@ToString
19	-@NoArgsConstructor
20	-@EqualsAndHashCode(callSuper = false)
21	-@SuperBuilder
22	-public class CheckBillMappingQueryVO extends BasePageVO implements Serializable {
23	-
24	- private List<Long> ids;
25	-
26	-
27	- private Long id;
28	- /**
29	- * 生产科对账单号
30	- */
31	- private String checkNo;
32	- /**
33	- * check账单id
34	- */
35	- private Long checkBillId;
36	- /**
37	- * 订单id
38	- */
39	- private Long orderId;
40	-
41	-
42	-}
43	-

src/main/java/com/order/erp/domain/vo/order/CheckBillMappingVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import lombok.*;
4	-import lombok.experimental.SuperBuilder;
5	-
6	-import java.io.Serializable;
7	-
8	-/**
9	- * 生产科对账单应收账单映射表(CheckBillMapping)实体类
10	- *
11	- * @author makejava
12	- * @since 2024-08-05 16:26:37
13	- */
14	-@Data
15	-@AllArgsConstructor
16	-@ToString
17	-@NoArgsConstructor
18	-@EqualsAndHashCode(callSuper = false)
19	-@SuperBuilder
20	-public class CheckBillMappingVO implements Serializable {
21	-
22	- private Long id;
23	- /**
24	- * 生产科对账单号
25	- */
26	- private String checkNo;
27	- /**
28	- * check账单id
29	- */
30	- private Long checkBillId;
31	- /**
32	- * 订单id
33	- */
34	- private Long orderId;
35	-
36	-
37	-}

src/main/java/com/order/erp/domain/vo/order/InvoiceBaseOrderQueryVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import com.order.erp.domain.vo.BasePageVO;
4	-import lombok.*;
5	-import lombok.experimental.SuperBuilder;
6	-
7	-import javax.validation.constraints.NotBlank;
8	-import java.io.Serializable;
9	-
10	-/**
11	- * 应收款账单表(InvoiceBillOrder)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:34
15	- */
16	-@Data
17	-@AllArgsConstructor
18	-@ToString
19	-@NoArgsConstructor
20	-@EqualsAndHashCode(callSuper = false)
21	-@SuperBuilder
22	-public class InvoiceBaseOrderQueryVO extends BasePageVO implements Serializable {
23	-
24	- /**
25	- * 发票单号
26	- */
27	- @NotBlank(message = "发票单号不能为空")
28	- private String invoiceNo;
29	-}
30	-

src/main/java/com/order/erp/domain/vo/order/InvoiceBillAmountInfoVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import lombok.*;
4	-import lombok.experimental.SuperBuilder;
5	-
6	-import java.io.Serializable;
7	-import java.math.BigDecimal;
8	-
9	-/**
10	- * 应收款账单 -- 其他金额信息
11	- *
12	- * @author makejava
13	- * @since 2024-08-05 16:26:33
14	- */
15	-@Data
16	-@AllArgsConstructor
17	-@ToString
18	-@NoArgsConstructor
19	-@EqualsAndHashCode(callSuper = false)
20	-@SuperBuilder
21	-public class InvoiceBillAmountInfoVO implements Serializable {
22	-
23	- private Long id;
24	-
25	- /**
26	- * 报关单url地址
27	- */
28	- private String bgUrl;
29	-
30	- /**
31	- * 实际应收金额
32	- */
33	- private BigDecimal actualReceivableAmount;
34	- /**
35	- * 实际应付金额1
36	- */
37	- private BigDecimal actualPayedAmount1;
38	- /**
39	- * 实际应付金额2
40	- */
41	- private BigDecimal actualPayedAmount2;
42	- /**
43	- * 实际应付金额3
44	- */
45	- private BigDecimal actualPayedAmount3;
46	- /**
47	- * 其他费用金额
48	- */
49	- private BigDecimal otherAmount;
50	-
51	-}

src/main/java/com/order/erp/domain/vo/order/InvoiceBillCreateVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import lombok.*;
4	-import lombok.experimental.SuperBuilder;
5	-
6	-import java.io.Serializable;
7	-import java.util.List;
8	-
9	-/**
10	- * 应收款账单表(InvoiceBillOrder)实体类
11	- *
12	- * @author makejava
13	- * @since 2024-08-05 16:26:33
14	- */
15	-@Data
16	-@AllArgsConstructor
17	-@ToString
18	-@NoArgsConstructor
19	-@EqualsAndHashCode(callSuper = false)
20	-@SuperBuilder
21	-public class InvoiceBillCreateVO implements Serializable {
22	- private static final long serialVersionUID = 543899167451834300L;
23	-
24	- private Long id;
25	-
26	- /**
27	- * 发票单号
28	- */
29	- private String invoiceNo;
30	-
31	- /**
32	- * 报关单url地址
33	- */
34	- private String bgUrl;
35	-
36	- /**
37	- * 必须回款日期
38	- */
39	- private String backRefundDate;
40	-
41	- /**
42	- * 订单id集合
43	- */
44	- private List<Long> orderIds;
45	-
46	-
47	-}

src/main/java/com/order/erp/domain/vo/order/InvoiceBillDeductInfoVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import lombok.*;
4	-import lombok.experimental.SuperBuilder;
5	-
6	-import java.io.Serializable;
7	-import java.math.BigDecimal;
8	-
9	-/**
10	- * 应收款账单 -- 扣款信息
11	- *
12	- * @author makejava
13	- * @since 2024-08-05 16:26:33
14	- */
15	-@Data
16	-@AllArgsConstructor
17	-@ToString
18	-@NoArgsConstructor
19	-@EqualsAndHashCode(callSuper = false)
20	-@SuperBuilder
21	-public class InvoiceBillDeductInfoVO implements Serializable {
22	-
23	- private Long id;
24	-
25	- /**
26	- * 发票单号
27	- */
28	- private String invoiceNo;
29	-
30	- /**
31	- * 发生扣款金额
32	- */
33	- private BigDecimal deductAmount;
34	-
35	- /**
36	- * 扣款单url地址
37	- */
38	- private String deductUrl;
39	-
40	-}

src/main/java/com/order/erp/domain/vo/order/InvoiceBillMappingQueryVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import com.order.erp.domain.vo.BasePageVO;
4	-import lombok.*;
5	-import lombok.experimental.SuperBuilder;
6	-
7	-import java.io.Serializable;
8	-import java.util.List;
9	-
10	-/**
11	- * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:36
15	- */
16	-@Data
17	-@AllArgsConstructor
18	-@ToString
19	-@NoArgsConstructor
20	-@EqualsAndHashCode(callSuper = false)
21	-@SuperBuilder
22	-public class InvoiceBillMappingQueryVO extends BasePageVO implements Serializable {
23	- private static final long serialVersionUID = -10772282327497511L;
24	-
25	- private List<Long> ids;
26	-
27	-
28	- private Long id;
29	- /**
30	- * 发票单号
31	- */
32	- private String invoiceNo;
33	- /**
34	- * invoice账单id
35	- */
36	- private Long invoiceBillId;
37	- /**
38	- * 订单id
39	- */
40	- private Long orderId;
41	-
42	-
43	-}
44	-

src/main/java/com/order/erp/domain/vo/order/InvoiceBillMappingVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import lombok.*;
4	-import lombok.experimental.SuperBuilder;
5	-
6	-import java.io.Serializable;
7	-
8	-/**
9	- * 应收款账单关联订单映射表(InvoiceBillMapping)实体类
10	- *
11	- * @author makejava
12	- * @since 2024-08-05 16:26:36
13	- */
14	-@Data
15	-@AllArgsConstructor
16	-@ToString
17	-@NoArgsConstructor
18	-@EqualsAndHashCode(callSuper = false)
19	-@SuperBuilder
20	-public class InvoiceBillMappingVO implements Serializable {
21	- private static final long serialVersionUID = -55765026730369748L;
22	-
23	- private Long id;
24	- /**
25	- * 发票单号
26	- */
27	- private String invoiceNo;
28	- /**
29	- * invoice账单id
30	- */
31	- private Long invoiceBillId;
32	- /**
33	- * 订单id
34	- */
35	- private Long orderId;
36	-
37	-
38	-}

src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderQueryVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import com.order.erp.domain.vo.BasePageVO;
4	-import lombok.*;
5	-import lombok.experimental.SuperBuilder;
6	-
7	-import java.io.Serializable;
8	-import java.util.List;
9	-
10	-/**
11	- * 应收款账单表(InvoiceBillOrder)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:34
15	- */
16	-@Data
17	-@AllArgsConstructor
18	-@ToString
19	-@NoArgsConstructor
20	-@EqualsAndHashCode(callSuper = false)
21	-@SuperBuilder
22	-public class InvoiceBillOrderQueryVO extends BasePageVO implements Serializable {
23	-
24	- private List<Long> ids;
25	-
26	- /**
27	- * 发票单号
28	- */
29	- private String invoiceNo;
30	-
31	- /**
32	- * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
33	- */
34	- private Integer status;
35	-
36	- /**
37	- * 客户编码
38	- */
39	- private String customerCode;
40	-
41	- /**
42	- * 项目号
43	- */
44	- private String projectNo;
45	-
46	- /**
47	- * 生产科
48	- */
49	- private String productionDepartment;
50	-
51	- /**
52	- * 内部编号
53	- */
54	- private String innerNo;
55	-
56	- /**
57	- * 客户po号
58	- */
59	- private String customerPo;
60	-}
61	-

src/main/java/com/order/erp/domain/vo/order/InvoiceBillOrderVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import lombok.*;
4	-import lombok.experimental.SuperBuilder;
5	-
6	-import java.io.Serializable;
7	-import java.math.BigDecimal;
8	-
9	-/**
10	- * 应收款账单表(InvoiceBillOrder)实体类
11	- *
12	- * @author makejava
13	- * @since 2024-08-05 16:26:33
14	- */
15	-@Data
16	-@AllArgsConstructor
17	-@ToString
18	-@NoArgsConstructor
19	-@EqualsAndHashCode(callSuper = false)
20	-@SuperBuilder
21	-public class InvoiceBillOrderVO implements Serializable {
22	- private static final long serialVersionUID = 543899167451834300L;
23	-
24	- private Long id;
25	-
26	- /**
27	- * 发票单号
28	- */
29	- private String invoiceNo;
30	-
31	- /**
32	- * 报关单url地址
33	- */
34	- private String bgUrl;
35	-
36	- /**
37	- * 必须回款日期
38	- */
39	- private String backRefundDate;
40	-
41	- /**
42	- * 发生扣款金额
43	- */
44	- private BigDecimal deductAmount;
45	-
46	- /**
47	- * 扣款单url地址
48	- */
49	- private String deductUrl;
50	-
51	- /**
52	- * 实际应收金额
53	- */
54	- private BigDecimal actualReceivableAmount;
55	-
56	- /**
57	- * 实际应付金额1
58	- */
59	- private BigDecimal actualPayedAmount1;
60	-
61	- /**
62	- * 实际应付金额2
63	- */
64	- private BigDecimal actualPayedAmount2;
65	-
66	- /**
67	- * 实际应付金额3
68	- */
69	- private BigDecimal actualPayedAmount3;
70	-
71	- /**
72	- * 其他费用金额
73	- */
74	- private BigDecimal otherAmount;
75	-
76	- /**
77	- * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
78	- */
79	- private Integer status;
80	-
81	-
82	-}

src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillOrderQueryVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import com.order.erp.domain.vo.BasePageVO;
4	-import lombok.*;
5	-import lombok.experimental.SuperBuilder;
6	-
7	-import java.io.Serializable;
8	-import java.util.List;
9	-
10	-/**
11	- * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
12	- *
13	- * @author makejava
14	- * @since 2024-08-05 16:26:35
15	- */
16	-@Data
17	-@AllArgsConstructor
18	-@ToString
19	-@NoArgsConstructor
20	-@EqualsAndHashCode(callSuper = false)
21	-@SuperBuilder
22	-public class ProducePaymentCheckBillOrderQueryVO extends BasePageVO implements Serializable {
23	-
24	- private List<Long> ids;
25	-
26	-
27	- private Long id;
28	- /**
29	- * 生产科对账单
30	- */
31	- private String checkNo;
32	- /**
33	- * 发票url地址
34	- */
35	- private String invoiceUrl;
36	- /**
37	- * 扣款单url地址
38	- */
39	- private String deductPdfUrl;
40	- /**
41	- * 生产科应付款日期
42	- */
43	- private String payedDate;
44	- /**
45	- * 生产科扣款责任部门
46	- */
47	- private String deductDept;
48	- /**
49	- * 生产科扣款金额
50	- */
51	- private Double deductAmount;
52	- /**
53	- * 实际应付金额
54	- */
55	- private Double actualPayedAmount;
56	- /**
57	- * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
58	- */
59	- private Integer status;
60	-
61	-
62	-}
63	-

src/main/java/com/order/erp/domain/vo/order/ProducePaymentCheckBillOrderVO.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.domain.vo.order;
2	-
3	-import lombok.*;
4	-import lombok.experimental.SuperBuilder;
5	-
6	-import java.io.Serializable;
7	-
8	-/**
9	- * 生产科对账单应收账单(ProducePaymentCheckBillOrder)实体类
10	- *
11	- * @author makejava
12	- * @since 2024-08-05 16:26:35
13	- */
14	-@Data
15	-@AllArgsConstructor
16	-@ToString
17	-@NoArgsConstructor
18	-@EqualsAndHashCode(callSuper = false)
19	-@SuperBuilder
20	-public class ProducePaymentCheckBillOrderVO implements Serializable {
21	- private static final long serialVersionUID = 239047702576286556L;
22	-
23	- private Long id;
24	- /**
25	- * 生产科对账单
26	- */
27	- private String checkNo;
28	- /**
29	- * 发票url地址
30	- */
31	- private String invoiceUrl;
32	- /**
33	- * 扣款单url地址
34	- */
35	- private String deductPdfUrl;
36	- /**
37	- * 生产科应付款日期
38	- */
39	- private String payedDate;
40	- /**
41	- * 生产科扣款责任部门
42	- */
43	- private String deductDept;
44	- /**
45	- * 生产科扣款金额
46	- */
47	- private Double deductAmount;
48	- /**
49	- * 实际应付金额
50	- */
51	- private Double actualPayedAmount;
52	- /**
53	- * 总经理审核状态 0：待审核、1：审核通过，2：审核驳回
54	- */
55	- private Integer status;
56	-
57	-
58	-}

src/main/java/com/order/erp/mapper/order/CheckBillMappingMapper.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.mapper.order;
2	-
3	-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4	-import com.order.erp.domain.dto.order.CheckBillMappingDO;
5	-
6	-/**
7	- * 生产科对账单应收账单映射表(CheckBillMapping)表数据库访问层
8	- *
9	- * @author makejava
10	- * @since 2024-08-05 16:26:37
11	- */
12	-public interface CheckBillMappingMapper extends BaseMapper<CheckBillMappingDO> {
13	-
14	-
15	-}
16	-

src/main/java/com/order/erp/mapper/order/InvoiceBillMappingMapper.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.mapper.order;
2	-
3	-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4	-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
5	-
6	-/**
7	- * 应收款账单关联订单映射表(InvoiceBillMapping)表数据库访问层
8	- *
9	- * @author makejava
10	- * @since 2024-08-05 16:26:36
11	- */
12	-public interface InvoiceBillMappingMapper extends BaseMapper<InvoiceBillMappingDO> {
13	-
14	-
15	-}
16	-

src/main/java/com/order/erp/mapper/order/InvoiceBillOrderMapper.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.mapper.order;
2	-
3	-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4	-import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
5	-
6	-/**
7	- * 应收款账单表(InvoiceBillOrder)表数据库访问层
8	- *
9	- * @author makejava
10	- * @since 2024-08-05 16:26:34
11	- */
12	-public interface InvoiceBillOrderMapper extends BaseMapper<InvoiceBillOrderDO> {
13	-
14	-
15	-}
16	-

src/main/java/com/order/erp/mapper/order/ProducePaymentCheckBillOrderMapper.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.mapper.order;
2	-
3	-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4	-import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
5	-
6	-/**
7	- * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表数据库访问层
8	- *
9	- * @author makejava
10	- * @since 2024-08-05 16:26:35
11	- */
12	-public interface ProducePaymentCheckBillOrderMapper extends BaseMapper<ProducePaymentCheckBillOrderDO> {
13	-
14	-
15	-}
16	-

src/main/java/com/order/erp/service/order/CheckBillMappingService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.CheckBillMappingDO;
6	-import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
7	-import com.order.erp.domain.vo.order.CheckBillMappingVO;
8	-
9	-/**
10	- * 生产科对账单应收账单映射表(CheckBillMapping)表服务接口
11	- *
12	- * @author makejava
13	- * @since 2024-08-05 16:26:37
14	- */
15	-public interface CheckBillMappingService extends IService<CheckBillMappingDO> {
16	-
17	- /**
18	- * 通过ID查询单条数据
19	- *
20	- * @param checkBillMappingQueryVO 主键
21	- * @return 实例对象
22	- */
23	- ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO);
24	-
25	- /**
26	- * 分页查询
27	- *
28	- * @param checkBillMappingQueryVO 筛选条件
29	- * @return 查询结果
30	- */
31	- ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO);
32	-
33	- /**
34	- * 新增数据
35	- *
36	- * @param checkBillMappingVO 数据VO
37	- * @return 新增结果
38	- */
39	- ServerResult add(CheckBillMappingVO checkBillMappingVO);
40	-
41	- /**
42	- * 修改数据
43	- *
44	- * @param checkBillMappingVO 数据VO
45	- * @return 编辑结果
46	- */
47	- ServerResult edit(CheckBillMappingVO checkBillMappingVO);
48	-
49	- /**
50	- * 通过主键删除数据
51	- *
52	- * @param checkBillMappingQueryVO 筛选条件
53	- * @return 是否成功
54	- */
55	- ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO);
56	-
57	-}

src/main/java/com/order/erp/service/order/EmailTemplateService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.EmailTemplateDO;
6	-import com.order.erp.domain.vo.order.EmailTemplateQueryVO;
7	-import com.order.erp.domain.vo.order.EmailTemplateVO;
8	-
9	-/**
10	- * 邮件模板表(EmailTemplate)表服务接口
11	- *
12	- * @author makejava
13	- * @since 2024-07-03 10:58:27
14	- */
15	-public interface EmailTemplateService extends IService<EmailTemplateDO> {
16	-
17	- /**
18	- * 通过ID查询单条数据
19	- *
20	- * @param emailTemplateQueryVO 主键
21	- * @return 实例对象
22	- */
23	- ServerResult queryById(EmailTemplateQueryVO emailTemplateQueryVO);
24	-
25	- /**
26	- * 分页查询
27	- *
28	- * @param emailTemplateQueryVO 筛选条件
29	- * @return 查询结果
30	- */
31	- ServerResult list(EmailTemplateQueryVO emailTemplateQueryVO);
32	-
33	- /**
34	- * 新增数据
35	- *
36	- * @param emailTemplateVO 数据VO
37	- * @return 新增结果
38	- */
39	- ServerResult add(EmailTemplateVO emailTemplateVO);
40	-
41	- /**
42	- * 修改数据
43	- *
44	- * @param emailTemplateVO 数据VO
45	- * @return 编辑结果
46	- */
47	- ServerResult edit(EmailTemplateVO emailTemplateVO);
48	-
49	- /**
50	- * 通过主键删除数据
51	- *
52	- * @param emailTemplateQueryVO 筛选条件
53	- * @return 是否成功
54	- */
55	- ServerResult deleteById(EmailTemplateQueryVO emailTemplateQueryVO);
56	-
57	-}

src/main/java/com/order/erp/service/order/InvoiceBillMappingService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
6	-import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
7	-import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
8	-
9	-/**
10	- * 应收款账单关联订单映射表(InvoiceBillMapping)表服务接口
11	- *
12	- * @author makejava
13	- * @since 2024-08-05 16:26:36
14	- */
15	-public interface InvoiceBillMappingService extends IService<InvoiceBillMappingDO> {
16	-
17	- /**
18	- * 通过ID查询单条数据
19	- *
20	- * @param invoiceBillMappingQueryVO 主键
21	- * @return 实例对象
22	- */
23	- ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
24	-
25	- /**
26	- * 分页查询
27	- *
28	- * @param invoiceBillMappingQueryVO 筛选条件
29	- * @return 查询结果
30	- */
31	- ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
32	-
33	- /**
34	- * 新增数据
35	- *
36	- * @param invoiceBillMappingVO 数据VO
37	- * @return 新增结果
38	- */
39	- ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO);
40	-
41	- /**
42	- * 修改数据
43	- *
44	- * @param invoiceBillMappingVO 数据VO
45	- * @return 编辑结果
46	- */
47	- ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO);
48	-
49	- /**
50	- * 通过主键删除数据
51	- *
52	- * @param invoiceBillMappingQueryVO 筛选条件
53	- * @return 是否成功
54	- */
55	- ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO);
56	-
57	-}

src/main/java/com/order/erp/service/order/InvoiceBillOrderService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
6	-import com.order.erp.domain.vo.order.*;
7	-
8	-/**
9	- * 应收款账单表(InvoiceBillOrder)表服务接口
10	- *
11	- * @author makejava
12	- * @since 2024-08-05 16:26:34
13	- */
14	-public interface InvoiceBillOrderService extends IService<InvoiceBillOrderDO> {
15	-
16	- /**
17	- * 分页查询
18	- *
19	- * @param invoiceBillOrderQueryVO 筛选条件
20	- * @return 查询结果
21	- */
22	- ServerResult listByPage(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
23	-
24	- /**
25	- * @param queryVO
26	- * @return
27	- */
28	- ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO);
29	-
30	- /**
31	- * 新增数据
32	- *
33	- * @param createVO 数据VO
34	- * @return 新增结果
35	- */
36	- ServerResult create(InvoiceBillCreateVO createVO);
37	-
38	- /**
39	- * 更新扣款信息
40	- *
41	- * @param deductInfoVO 数据VO
42	- * @return 编辑结果
43	- */
44	- ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO);
45	-
46	- /**
47	- * 更新其他金额信息
48	- *
49	- * @param amountInfoVO
50	- * @return
51	- */
52	- ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO);
53	-
54	- /**
55	- * 通过主键删除数据
56	- *
57	- * @param invoiceBillOrderQueryVO 筛选条件
58	- * @return 是否成功
59	- */
60	- ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO);
61	-
62	-}

src/main/java/com/order/erp/service/order/OrderAuditLogService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.OrderAuditLogDO;
6	-import com.order.erp.domain.vo.order.OrderAuditLogQueryVO;
7	-import com.order.erp.domain.vo.order.OrderAuditLogVO;
8	-
9	-import java.util.List;
10	-
11	-/**
12	- * 用户订单审批日志表(OrderAuditLog)表服务接口
13	- *
14	- * @author makejava
15	- * @since 2023-09-08 15:26:42
16	- */
17	-public interface OrderAuditLogService extends IService<OrderAuditLogDO> {
18	-
19	- /**
20	- * 通过ID查询单条数据
21	- *
22	- * @param orderAuditLogQueryVO 主键
23	- * @return 实例对象
24	- */
25	- ServerResult queryById(OrderAuditLogQueryVO orderAuditLogQueryVO);
26	-
27	- /**
28	- * 分页查询
29	- *
30	- * @param orderAuditLogQueryVO 筛选条件
31	- * @return 查询结果
32	- */
33	- ServerResult list(OrderAuditLogQueryVO orderAuditLogQueryVO);
34	-
35	-
36	- /**
37	- *
38	- * @param queryVO
39	- * @return
40	- */
41	- ServerResult listByPage(OrderAuditLogQueryVO queryVO);
42	-
43	- /**
44	- * 新增数据
45	- *
46	- * @param orderAuditLogVO 数据VO
47	- * @return 新增结果
48	- */
49	- ServerResult add(OrderAuditLogVO orderAuditLogVO);
50	-
51	- /**
52	- * 修改数据
53	- *
54	- * @param orderAuditLogVO 数据VO
55	- * @return 编辑结果
56	- */
57	- ServerResult edit(OrderAuditLogVO orderAuditLogVO);
58	-
59	- /**
60	- * 通过主键删除数据
61	- *
62	- * @param orderAuditLogQueryVO 筛选条件
63	- * @return 是否成功
64	- */
65	- ServerResult deleteById(OrderAuditLogQueryVO orderAuditLogQueryVO);
66	-
67	- boolean deleteByOrderId(Long getId);
68	-
69	- boolean deleteByOrderIds(List<Long> orderIds);
70	-}

src/main/java/com/order/erp/service/order/OrderBaseInfoService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4	-import com.baomidou.mybatisplus.extension.service.IService;
5	-import com.order.erp.common.constant.ServerResult;
6	-import com.order.erp.common.excel4j.exceptions.Excel4JException;
7	-import com.order.erp.domain.dto.order.OrderBaseInfoDO;
8	-import com.order.erp.domain.vo.order.*;
9	-
10	-import javax.servlet.http.HttpServletResponse;
11	-import java.io.IOException;
12	-import java.util.List;
13	-import java.util.Map;
14	-
15	-/**
16	- * 订单基础信息表(OrderBaseInfo)表服务接口
17	- *
18	- * @author makejava
19	- * @since 2023-09-08 15:26:43
20	- */
21	-public interface OrderBaseInfoService extends IService<OrderBaseInfoDO> {
22	-
23	- /**
24	- *
25	- * @param queryVO
26	- * @return
27	- */
28	- LambdaQueryWrapper<OrderBaseInfoDO> buildQueryByParam(OrderBaseInfoQueryVO queryVO);
29	-
30	- /**
31	- * 通过ID查询单条数据
32	- *
33	- * @param orderBaseInfoQueryVO 主键
34	- * @return 实例对象
35	- */
36	- ServerResult queryById(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
37	-
38	- /**
39	- * 分页查询
40	- *
41	- * @param orderBaseInfoQueryVO 筛选条件
42	- * @return 查询结果
43	- */
44	- ServerResult list(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
45	-
46	- /**
47	- * @param orderBaseInfoDOList
48	- * @return
49	- */
50	- List<OrderInfoResultVO> wrapperOrderResultList(Boolean locked, List<OrderBaseInfoDO> orderBaseInfoDOList);
51	-
52	- /**
53	- * @param orderBaseInfoQueryVO
54	- * @return
55	- */
56	- ServerResult listByPage(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
57	-
58	- /**
59	- * 校验是否重复
60	- * @param orderBaseInfoQueryVO
61	- * @return
62	- */
63	- ServerResult check(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
64	-
65	- /**
66	- * @param response
67	- * @param orderBaseInfoQueryVO
68	- * @return
69	- */
70	- void export(HttpServletResponse response, OrderBaseInfoQueryVO orderBaseInfoQueryVO) throws IOException, Excel4JException;
71	-
72	- /**
73	- * @param fieldVO
74	- * @return
75	- */
76	- ServerResult fieldUnlockApply(OrderUnlockFieldApplyVO fieldVO);
77	-
78	- /**
79	- * 新增数据
80	- *
81	- * @param orderAddVO 数据VO
82	- * @return 新增结果
83	- */
84	- ServerResult add(OrderAddVO orderAddVO);
85	-
86	- /**
87	- * 修改数据
88	- *
89	- * @param updateVO 数据VO
90	- * @return 编辑结果
91	- */
92	- ServerResult edit(OrderUpdateVO updateVO);
93	-
94	- /**
95	- * 通过主键删除数据
96	- *
97	- * @param orderBaseInfoQueryVO 筛选条件
98	- * @return 是否成功
99	- */
100	- ServerResult deleteById(OrderBaseInfoQueryVO orderBaseInfoQueryVO);
101	-
102	- long countByOrderStatus(Integer orderFinish);
103	-
104	- long countRecentMonthByOrderStatus(Integer orderFinish);
105	-
106	-
107	- List<Map<String, Integer>> countDaysOrder();
108	-
109	- long countAll();
110	-
111	- long countRecentYear();
112	-
113	- ServerResult checkChargeOrderCount(List<Long> orderIds);
114	-}

src/main/java/com/order/erp/service/order/OrderCompletionReportService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.common.excel4j.exceptions.Excel4JException;
6	-import com.order.erp.domain.dto.order.OrderCompletionReportDO;
7	-import com.order.erp.domain.vo.OrderReportAnalysisVo;
8	-import com.order.erp.domain.vo.order.OrderBaseInfoQueryVO;
9	-import com.order.erp.domain.vo.order.OrderCompletionReportQueryVO;
10	-import com.order.erp.domain.vo.order.OrderCompletionReportVO;
11	-
12	-import javax.servlet.http.HttpServletResponse;
13	-import java.io.IOException;
14	-import java.util.List;
15	-
16	-/**
17	- * 订单-项目完成报告书(OrderCompletionReport)表服务接口
18	- *
19	- * @author makejava
20	- * @since 2023-09-08 15:26:44
21	- */
22	-public interface OrderCompletionReportService extends IService<OrderCompletionReportDO> {
23	-
24	- /**
25	- * 通过ID查询单条数据
26	- *
27	- * @param orderCompletionReportQueryVO 主键
28	- * @return 实例对象
29	- */
30	- ServerResult queryById(OrderCompletionReportQueryVO orderCompletionReportQueryVO);
31	-
32	- /**
33	- * 分页查询
34	- *
35	- * @param orderCompletionReportQueryVO 筛选条件
36	- * @return 查询结果
37	- */
38	- ServerResult list(OrderCompletionReportQueryVO orderCompletionReportQueryVO);
39	-
40	-
41	- /**
42	- * @param queryVO
43	- * @return
44	- */
45	- ServerResult analysis(OrderBaseInfoQueryVO queryVO);
46	-
47	- /**
48	- *
49	- * @param response
50	- * @param orderBaseInfoQueryVO
51	- * @return
52	- */
53	- ServerResult export(HttpServletResponse response, OrderBaseInfoQueryVO orderBaseInfoQueryVO) throws IOException, Excel4JException;
54	-
55	- /**
56	- * 新增数据
57	- *
58	- * @param orderCompletionReportVO 数据VO
59	- * @return 新增结果
60	- */
61	- ServerResult add(OrderCompletionReportVO orderCompletionReportVO);
62	-
63	- /**
64	- * 修改数据
65	- *
66	- * @param orderCompletionReportVO 数据VO
67	- * @return 编辑结果
68	- */
69	- ServerResult edit(OrderCompletionReportVO orderCompletionReportVO);
70	-
71	- /**
72	- * 通过主键删除数据
73	- *
74	- * @param orderCompletionReportQueryVO 筛选条件
75	- * @return 是否成功
76	- */
77	- ServerResult deleteById(OrderCompletionReportQueryVO orderCompletionReportQueryVO);
78	-
79	- boolean deleteByOrderId(Long orderId);
80	-
81	- boolean deleteByOrderIds(List<Long> orderIds);
82	-
83	- long countByOrderStatus(Integer status);
84	-
85	- long countYearByOrderStatus(Integer status);
86	-}

src/main/java/com/order/erp/service/order/OrderFieldLockApplyService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.OrderFieldLockApplyDO;
6	-import com.order.erp.domain.vo.order.AuditVO;
7	-import com.order.erp.domain.vo.order.OrderFieldLockApplyQueryVO;
8	-import com.order.erp.domain.vo.order.OrderFieldLockApplyVO;
9	-
10	-import java.util.List;
11	-
12	-/**
13	- * 用户订单-字段锁定申请表(OrderFieldLockApply)表服务接口
14	- *
15	- * @author makejava
16	- * @since 2023-09-08 15:26:45
17	- */
18	-public interface OrderFieldLockApplyService extends IService<OrderFieldLockApplyDO> {
19	-
20	- /**
21	- * 通过ID查询单条数据
22	- *
23	- * @param orderFieldLockApplyQueryVO 主键
24	- * @return 实例对象
25	- */
26	- ServerResult queryById(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO);
27	-
28	- /**
29	- * 分页查询
30	- *
31	- * @param orderFieldLockApplyQueryVO 筛选条件
32	- * @return 查询结果
33	- */
34	- ServerResult list(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO);
35	-
36	- /**
37	- * @param orderFieldLockApplyQueryVO
38	- * @return
39	- */
40	- ServerResult listByPage(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO);
41	-
42	- /**
43	- * 新增数据
44	- *
45	- * @param orderFieldLockApplyVO 数据VO
46	- * @return 新增结果
47	- */
48	- ServerResult add(OrderFieldLockApplyVO orderFieldLockApplyVO);
49	-
50	- /**
51	- * @param auditVO
52	- * @return
53	- */
54	- ServerResult doAudit(AuditVO auditVO);
55	-
56	- /**
57	- * 修改数据
58	- *
59	- * @param orderFieldLockApplyVO 数据VO
60	- * @return 编辑结果
61	- */
62	- ServerResult edit(OrderFieldLockApplyVO orderFieldLockApplyVO);
63	-
64	- /**
65	- * 通过主键删除数据
66	- *
67	- * @param orderFieldLockApplyQueryVO 筛选条件
68	- * @return 是否成功
69	- */
70	- ServerResult deleteById(OrderFieldLockApplyQueryVO orderFieldLockApplyQueryVO);
71	-
72	- boolean deleteByOrderId(Long orderId);
73	-
74	- boolean deleteByOrderIds(List<Long> orderIds);
75	-}

src/main/java/com/order/erp/service/order/OrderFieldLockRecordService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.OrderFieldLockRecordDO;
6	-import com.order.erp.domain.vo.order.OrderFieldLockRecordQueryVO;
7	-import com.order.erp.domain.vo.order.OrderFieldLockRecordVO;
8	-
9	-import java.util.List;
10	-
11	-/**
12	- * 用户订单-字段锁定记录表(OrderFieldLockRecord)表服务接口
13	- *
14	- * @author makejava
15	- * @since 2023-09-08 15:26:45
16	- */
17	-public interface OrderFieldLockRecordService extends IService<OrderFieldLockRecordDO> {
18	-
19	- /**
20	- * 通过ID查询单条数据
21	- *
22	- * @param orderFieldLockRecordQueryVO 主键
23	- * @return 实例对象
24	- */
25	- ServerResult queryById(OrderFieldLockRecordQueryVO orderFieldLockRecordQueryVO);
26	-
27	- /**
28	- * 分页查询
29	- *
30	- * @param orderFieldLockRecordQueryVO 筛选条件
31	- * @return 查询结果
32	- */
33	- ServerResult list(OrderFieldLockRecordQueryVO orderFieldLockRecordQueryVO);
34	-
35	- /**
36	- * 新增数据
37	- *
38	- * @param orderFieldLockRecordVO 数据VO
39	- * @return 新增结果
40	- */
41	- ServerResult add(OrderFieldLockRecordVO orderFieldLockRecordVO);
42	-
43	- /**
44	- * 修改数据
45	- *
46	- * @param orderFieldLockRecordVO 数据VO
47	- * @return 编辑结果
48	- */
49	- ServerResult edit(OrderFieldLockRecordVO orderFieldLockRecordVO);
50	-
51	- /**
52	- * 通过主键删除数据
53	- *
54	- * @param orderFieldLockRecordQueryVO 筛选条件
55	- * @return 是否成功
56	- */
57	- ServerResult deleteById(OrderFieldLockRecordQueryVO orderFieldLockRecordQueryVO);
58	-
59	- boolean deleteByOrderId(Long orderId);
60	-
61	- boolean deleteByOrderIds(List<Long> orderIds);
62	-}

src/main/java/com/order/erp/service/order/OrderInspectionStageService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.OrderStatusEnum;
6	-import com.order.erp.domain.dto.order.OrderInspectionStageDO;
7	-import com.order.erp.domain.vo.order.OrderInspectionStageQueryVO;
8	-import com.order.erp.domain.vo.order.OrderInspectionStageVO;
9	-
10	-import java.util.List;
11	-
12	-/**
13	- * 订单-质检环节(OrderInspectionStage)表服务接口
14	- *
15	- * @author makejava
16	- * @since 2023-09-08 15:26:46
17	- */
18	-public interface OrderInspectionStageService extends IService<OrderInspectionStageDO> {
19	-
20	- /**
21	- * 通过ID查询单条数据
22	- *
23	- * @param orderInspectionStageQueryVO 主键
24	- * @return 实例对象
25	- */
26	- ServerResult queryById(OrderInspectionStageQueryVO orderInspectionStageQueryVO);
27	-
28	- /**
29	- * 分页查询
30	- *
31	- * @param orderInspectionStageQueryVO 筛选条件
32	- * @return 查询结果
33	- */
34	- ServerResult list(OrderInspectionStageQueryVO orderInspectionStageQueryVO);
35	-
36	- /**
37	- * 新增数据
38	- *
39	- * @param orderInspectionStageVO 数据VO
40	- * @return 新增结果
41	- */
42	- ServerResult add(OrderInspectionStageVO orderInspectionStageVO);
43	-
44	- /**
45	- * 修改数据
46	- *
47	- * @param orderInspectionStageVO 数据VO
48	- * @return 编辑结果
49	- */
50	- ServerResult edit(OrderInspectionStageVO orderInspectionStageVO);
51	-
52	- /**
53	- * 通过主键删除数据
54	- *
55	- * @param orderInspectionStageQueryVO 筛选条件
56	- * @return 是否成功
57	- */
58	- ServerResult deleteById(OrderInspectionStageQueryVO orderInspectionStageQueryVO);
59	-
60	- boolean deleteByOrderId(Long orderId);
61	-
62	- boolean deleteByOrderIds(List<Long> orderIds);
63	-
64	- long countByOrderStatus(Integer orderStatus);
65	-
66	- long countRecentMonthByOrderStatus(Integer status);
67	-}

src/main/java/com/order/erp/service/order/OrderOptLogService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.OrderOptLogDO;
6	-import com.order.erp.domain.vo.order.OrderOptLogQueryVO;
7	-import com.order.erp.domain.vo.order.OrderOptLogVO;
8	-
9	-import java.util.List;
10	-
11	-/**
12	- * 用户订单操作日志表(OrderOptLog)表服务接口
13	- *
14	- * @author makejava
15	- * @since 2023-09-08 15:26:46
16	- */
17	-public interface OrderOptLogService extends IService<OrderOptLogDO> {
18	-
19	- /**
20	- * 通过ID查询单条数据
21	- *
22	- * @param orderOptLogQueryVO 主键
23	- * @return 实例对象
24	- */
25	- ServerResult queryById(OrderOptLogQueryVO orderOptLogQueryVO);
26	-
27	- /**
28	- * 分页查询
29	- *
30	- * @param orderOptLogQueryVO 筛选条件
31	- * @return 查询结果
32	- */
33	- ServerResult list(OrderOptLogQueryVO orderOptLogQueryVO);
34	-
35	- /**
36	- *
37	- * @param orderOptLogQueryVO
38	- * @return
39	- */
40	- ServerResult listByPage(OrderOptLogQueryVO orderOptLogQueryVO);
41	-
42	- /**
43	- * 新增数据
44	- *
45	- * @param orderOptLogVO 数据VO
46	- * @return 新增结果
47	- */
48	- ServerResult add(OrderOptLogVO orderOptLogVO);
49	-
50	- /**
51	- * 修改数据
52	- *
53	- * @param orderOptLogVO 数据VO
54	- * @return 编辑结果
55	- */
56	- ServerResult edit(OrderOptLogVO orderOptLogVO);
57	-
58	- /**
59	- * 通过主键删除数据
60	- *
61	- * @param orderOptLogQueryVO 筛选条件
62	- * @return 是否成功
63	- */
64	- ServerResult deleteById(OrderOptLogQueryVO orderOptLogQueryVO);
65	-
66	- boolean deleteByOrderId(Long orderId);
67	-
68	- boolean deleteByOrderIds(List<Long> orderIds);
69	-}

src/main/java/com/order/erp/service/order/OrderProfitAnalysisService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.OrderProfitAnalysisDO;
6	-import com.order.erp.domain.vo.OrderProfitAnalysisVo;
7	-import com.order.erp.domain.vo.order.OrderProfitAnalysisQueryVO;
8	-import com.order.erp.domain.vo.order.OrderProfitAnalysisVO;
9	-import com.order.erp.domain.vo.order.ProfitCalculateVO;
10	-
11	-import java.util.List;
12	-
13	-/**
14	- * 订单利润分析表(OrderProfitAnalysis)表服务接口
15	- *
16	- * @author makejava
17	- * @since 2023-09-08 15:26:47
18	- */
19	-public interface OrderProfitAnalysisService extends IService<OrderProfitAnalysisDO> {
20	-
21	- /**
22	- * 通过ID查询单条数据
23	- *
24	- * @param orderProfitAnalysisQueryVO 主键
25	- * @return 实例对象
26	- */
27	- ServerResult queryById(OrderProfitAnalysisQueryVO orderProfitAnalysisQueryVO);
28	-
29	- /**
30	- * 分页查询
31	- *
32	- * @param orderProfitAnalysisQueryVO 筛选条件
33	- * @return 查询结果
34	- */
35	- ServerResult list(OrderProfitAnalysisQueryVO orderProfitAnalysisQueryVO);
36	-
37	- /**
38	- * 新增数据
39	- *
40	- * @param orderProfitAnalysisVO 数据VO
41	- * @return 新增结果
42	- */
43	- ServerResult add(OrderProfitAnalysisVO orderProfitAnalysisVO);
44	-
45	- /**
46	- * 修改数据
47	- *
48	- * @param orderProfitAnalysisVO 数据VO
49	- * @return 编辑结果
50	- */
51	- ServerResult edit(OrderProfitAnalysisVO orderProfitAnalysisVO);
52	-
53	- /**
54	- * 通过主键删除数据
55	- *
56	- * @param orderProfitAnalysisQueryVO 筛选条件
57	- * @return 是否成功
58	- */
59	- ServerResult deleteById(OrderProfitAnalysisQueryVO orderProfitAnalysisQueryVO);
60	-
61	- boolean deleteByOrderId(Long orderId);
62	-
63	- boolean deleteByOrderIds(List<Long> orderIds);
64	-
65	- ServerResult<OrderProfitAnalysisVO> analysisByOrderIds(OrderProfitAnalysisVo orderProfitAnalysisVo);
66	-
67	- ServerResult<OrderProfitAnalysisVO> analysis(OrderProfitAnalysisVo orderProfitAnalysisVo);
68	-
69	- ServerResult<OrderProfitAnalysisVO> analysisByQueryVO(OrderProfitAnalysisVo orderProfitAnalysisVo);
70	-
71	- ServerResult calculate(ProfitCalculateVO calculateVO);
72	-
73	- long countByOrderStatus(Integer status);
74	-
75	- long countRecentWeekByOrderStatus(Integer status);
76	-}

src/main/java/com/order/erp/service/order/OrderTrackStageService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.OrderTrackStageDO;
6	-import com.order.erp.domain.vo.order.OrderTrackStageQueryVO;
7	-import com.order.erp.domain.vo.order.OrderTrackStageVO;
8	-
9	-import java.util.List;
10	-
11	-/**
12	- * 订单-跟单环节(OrderTrackStage)表服务接口
13	- *
14	- * @author makejava
15	- * @since 2023-09-08 15:26:48
16	- */
17	-public interface OrderTrackStageService extends IService<OrderTrackStageDO> {
18	-
19	- /**
20	- * 通过ID查询单条数据
21	- *
22	- * @param orderTrackStageQueryVO 主键
23	- * @return 实例对象
24	- */
25	- ServerResult queryById(OrderTrackStageQueryVO orderTrackStageQueryVO);
26	-
27	- /**
28	- * 分页查询
29	- *
30	- * @param orderTrackStageQueryVO 筛选条件
31	- * @return 查询结果
32	- */
33	- ServerResult list(OrderTrackStageQueryVO orderTrackStageQueryVO);
34	-
35	- /**
36	- * 新增数据
37	- *
38	- * @param orderTrackStageVO 数据VO
39	- * @return 新增结果
40	- */
41	- ServerResult add(OrderTrackStageVO orderTrackStageVO);
42	-
43	- /**
44	- * 修改数据
45	- *
46	- * @param orderTrackStageVO 数据VO
47	- * @return 编辑结果
48	- */
49	- ServerResult edit(OrderTrackStageVO orderTrackStageVO);
50	-
51	- /**
52	- * 通过主键删除数据
53	- *
54	- * @param orderTrackStageQueryVO 筛选条件
55	- * @return 是否成功
56	- */
57	- ServerResult deleteById(OrderTrackStageQueryVO orderTrackStageQueryVO);
58	-
59	- boolean deleteByOrderId(Long orderId);
60	-
61	- boolean deleteByOrderIds(List<Long> orderIds);
62	-}

src/main/java/com/order/erp/service/order/OrderUpdateLogService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.OrderUpdateLogDO;
6	-import com.order.erp.domain.vo.order.OrderUpdateLogQueryVO;
7	-import com.order.erp.domain.vo.order.OrderUpdateLogVO;
8	-
9	-/**
10	- * 订单更新日志表(OrderUpdateLog)表服务接口
11	- *
12	- * @author makejava
13	- * @since 2024-07-03 17:30:32
14	- */
15	-public interface OrderUpdateLogService extends IService<OrderUpdateLogDO> {
16	-
17	- /**
18	- * 通过ID查询单条数据
19	- *
20	- * @param orderUpdateLogQueryVO 主键
21	- * @return 实例对象
22	- */
23	- ServerResult queryById(OrderUpdateLogQueryVO orderUpdateLogQueryVO);
24	-
25	- /**
26	- * 分页查询
27	- *
28	- * @param orderUpdateLogQueryVO 筛选条件
29	- * @return 查询结果
30	- */
31	- ServerResult list(OrderUpdateLogQueryVO orderUpdateLogQueryVO);
32	-
33	- /**
34	- * 新增数据
35	- *
36	- * @param orderUpdateLogVO 数据VO
37	- * @return 新增结果
38	- */
39	- ServerResult add(OrderUpdateLogVO orderUpdateLogVO);
40	-
41	- /**
42	- * 修改数据
43	- *
44	- * @param orderUpdateLogVO 数据VO
45	- * @return 编辑结果
46	- */
47	- ServerResult edit(OrderUpdateLogVO orderUpdateLogVO);
48	-
49	- /**
50	- * 通过主键删除数据
51	- *
52	- * @param orderUpdateLogQueryVO 筛选条件
53	- * @return 是否成功
54	- */
55	- ServerResult deleteById(OrderUpdateLogQueryVO orderUpdateLogQueryVO);
56	-
57	-}

src/main/java/com/order/erp/service/order/ProducePaymentCheckBillOrderService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.ProducePaymentCheckBillOrderDO;
6	-import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderQueryVO;
7	-import com.order.erp.domain.vo.order.ProducePaymentCheckBillOrderVO;
8	-
9	-/**
10	- * 生产科对账单应收账单(ProducePaymentCheckBillOrder)表服务接口
11	- *
12	- * @author makejava
13	- * @since 2024-08-05 16:26:35
14	- */
15	-public interface ProducePaymentCheckBillOrderService extends IService<ProducePaymentCheckBillOrderDO> {
16	-
17	- /**
18	- * 通过ID查询单条数据
19	- *
20	- * @param producePaymentCheckBillOrderQueryVO 主键
21	- * @return 实例对象
22	- */
23	- ServerResult queryById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
24	-
25	- /**
26	- * 分页查询
27	- *
28	- * @param producePaymentCheckBillOrderQueryVO 筛选条件
29	- * @return 查询结果
30	- */
31	- ServerResult list(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
32	-
33	- /**
34	- * 新增数据
35	- *
36	- * @param producePaymentCheckBillOrderVO 数据VO
37	- * @return 新增结果
38	- */
39	- ServerResult add(ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO);
40	-
41	- /**
42	- * 修改数据
43	- *
44	- * @param producePaymentCheckBillOrderVO 数据VO
45	- * @return 编辑结果
46	- */
47	- ServerResult edit(ProducePaymentCheckBillOrderVO producePaymentCheckBillOrderVO);
48	-
49	- /**
50	- * 通过主键删除数据
51	- *
52	- * @param producePaymentCheckBillOrderQueryVO 筛选条件
53	- * @return 是否成功
54	- */
55	- ServerResult deleteById(ProducePaymentCheckBillOrderQueryVO producePaymentCheckBillOrderQueryVO);
56	-
57	-}

src/main/java/com/order/erp/service/order/ReceiveEmailMappingService.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order;
2	-
3	-import com.baomidou.mybatisplus.extension.service.IService;
4	-import com.order.erp.common.constant.ServerResult;
5	-import com.order.erp.domain.dto.order.ReceiveEmailMappingDO;
6	-import com.order.erp.domain.vo.order.ReceiveEmailMappingQueryVO;
7	-import com.order.erp.domain.vo.order.ReceiveEmailMappingVO;
8	-
9	-
10	-/**
11	- * 邮件接收人信息绑定表(ReceiveEmailMapping)表服务接口
12	- *
13	- * @author makejava
14	- * @since 2024-07-03 10:58:52
15	- */
16	-public interface ReceiveEmailMappingService extends IService<ReceiveEmailMappingDO> {
17	-
18	- /**
19	- * 通过ID查询单条数据
20	- *
21	- * @param receiveEmailMappingQueryVO 主键
22	- * @return 实例对象
23	- */
24	- ServerResult queryById(ReceiveEmailMappingQueryVO receiveEmailMappingQueryVO);
25	-
26	- /**
27	- * 分页查询
28	- *
29	- *
30	- * @return 查询结果
31	- */
32	- ServerResult listGetAll();
33	-
34	- /**
35	- * 新增数据
36	- *
37	- * @param receiveEmailMappingVO 数据VO
38	- * @return 新增结果
39	- */
40	- ServerResult add(ReceiveEmailMappingVO receiveEmailMappingVO);
41	-
42	- /**
43	- * 修改数据
44	- *
45	- * @param receiveEmailMappingVO 数据VO
46	- * @return 编辑结果
47	- */
48	- ServerResult edit(ReceiveEmailMappingVO receiveEmailMappingVO);
49	-
50	- /**
51	- * 通过主键删除数据
52	- *
53	- * @param receiveEmailMappingVO 筛选条件
54	- * @return 是否成功
55	- */
56	- ServerResult deleteById(ReceiveEmailMappingVO receiveEmailMappingVO);
57	-
58	- ServerResult opt(ReceiveEmailMappingDO receiveEmailMappingDo);
59	-
60	-}

src/main/java/com/order/erp/service/order/impl/CheckBillMappingServiceImpl.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order.impl;
2	-
3	-import cn.hutool.core.bean.BeanUtil;
4	-import cn.hutool.core.collection.CollUtil;
5	-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
6	-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
7	-import com.baomidou.mybatisplus.core.metadata.IPage;
8	-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9	-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
10	-import com.order.erp.common.constant.Constant;
11	-import com.order.erp.common.constant.ServerResult;
12	-import com.order.erp.common.utils.PageUtils;
13	-import com.order.erp.domain.dto.order.CheckBillMappingDO;
14	-import com.order.erp.domain.vo.order.CheckBillMappingQueryVO;
15	-import com.order.erp.domain.vo.order.CheckBillMappingVO;
16	-import com.order.erp.mapper.order.CheckBillMappingMapper;
17	-import com.order.erp.service.order.CheckBillMappingService;
18	-import lombok.extern.slf4j.Slf4j;
19	-import org.springframework.stereotype.Service;
20	-
21	-import java.util.List;
22	-import java.util.Objects;
23	-
24	-/**
25	- * 生产科对账单应收账单映射表(CheckBillMapping)表服务实现类
26	- *
27	- * @author makejava
28	- * @since 2024-08-05 16:26:37
29	- */
30	-@Slf4j
31	-@Service
32	-public class CheckBillMappingServiceImpl extends ServiceImpl<CheckBillMappingMapper, CheckBillMappingDO> implements CheckBillMappingService {
33	-
34	-
35	- /**
36	- * 通过ID查询单条数据
37	- * <p>
38	- * checkBillMappingQueryVO 主键
39	- *
40	- * @return 实例对象
41	- */
42	- @Override
43	- public ServerResult queryById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
44	- if (Objects.isNull(checkBillMappingQueryVO.getId())) {
45	- return ServerResult.fail("id 不能为空");
46	- }
47	- CheckBillMappingDO CheckBillMappingDo = getById(checkBillMappingQueryVO.getId());
48	- if (Objects.isNull(CheckBillMappingDo)) {
49	- return ServerResult.success(null);
50	- }
51	- return ServerResult.success(BeanUtil.copyProperties(CheckBillMappingDo, CheckBillMappingVO.class));
52	- }
53	-
54	- /**
55	- * 分页查询
56	- *
57	- * @param checkBillMappingQueryVO 筛选条件
58	- * @return 查询结果
59	- */
60	- @Override
61	- public ServerResult list(CheckBillMappingQueryVO checkBillMappingQueryVO) {
62	-
63	- LambdaQueryWrapper<CheckBillMappingDO> queryWapper = new LambdaQueryWrapper<CheckBillMappingDO>()
64	- .eq(CheckBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
65	- .orderByDesc(CheckBillMappingDO::getId);
66	- Page page = new Page<>(checkBillMappingQueryVO.getPage(), checkBillMappingQueryVO.getPageSize());
67	- IPage<CheckBillMappingDO> iPage = page(page, queryWapper);
68	- checkBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
69	- return ServerResult.success(PageUtils.getPageReturn(null, checkBillMappingQueryVO));
70	- }
71	-
72	- /**
73	- * 新增数据
74	- *
75	- * @param checkBillMappingVO 实例对象
76	- * @return 实例对象
77	- */
78	- @Override
79	- public ServerResult add(CheckBillMappingVO checkBillMappingVO) {
80	- //todo 校验
81	- if (Objects.nonNull(checkBillMappingVO.getId())) {
82	- checkBillMappingVO.setId(null);
83	- }
84	- CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
85	-
86	- save(checkBillMappingDo);
87	-
88	- return ServerResult.success();
89	- }
90	-
91	- /**
92	- * 修改数据
93	- *
94	- * @param checkBillMappingVO 实例对象
95	- * @return 实例对象
96	- */
97	- @Override
98	- public ServerResult edit(CheckBillMappingVO checkBillMappingVO) {
99	- //todo 校验
100	- if (Objects.isNull(checkBillMappingVO.getId())) {
101	- return ServerResult.fail("id 不能为空");
102	- }
103	- CheckBillMappingDO checkBillMappingDo = BeanUtil.copyProperties(checkBillMappingVO, CheckBillMappingDO.class);
104	-
105	- updateById(checkBillMappingDo);
106	-
107	- return ServerResult.success();
108	- }
109	-
110	- /**
111	- * 通过主键删除数据
112	- *
113	- * @param checkBillMappingQueryVO 筛选条件
114	- * @return 是否成功
115	- */
116	- @Override
117	- public ServerResult deleteById(CheckBillMappingQueryVO checkBillMappingQueryVO) {
118	- List<Long> ids = checkBillMappingQueryVO.getIds();
119	- if (CollUtil.isEmpty(ids)) {
120	- return ServerResult.fail("ids 参数不能为空");
121	- }
122	- List<CheckBillMappingDO> checkBillMappingList = listByIds(ids);
123	- if (CollUtil.isEmpty(checkBillMappingList)) {
124	- return ServerResult.success();
125	- }
126	- //todo 校验是否可以逻辑删除
127	- LambdaUpdateWrapper<CheckBillMappingDO> updateWrapper = new LambdaUpdateWrapper<CheckBillMappingDO>()
128	- .in(CheckBillMappingDO::getId, ids)
129	- .set(CheckBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
130	- update(updateWrapper);
131	- return ServerResult.success();
132	- }
133	-}

src/main/java/com/order/erp/service/order/impl/EmailTemplateServiceImpl.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order.impl;
2	-
3	-import cn.hutool.core.bean.BeanUtil;
4	-import cn.hutool.core.collection.CollUtil;
5	-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
6	-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7	-import com.order.erp.common.constant.Constant;
8	-import com.order.erp.common.constant.ServerResult;
9	-import com.order.erp.common.utils.PageUtils;
10	-import com.order.erp.domain.dto.order.EmailTemplateDO;
11	-import com.order.erp.domain.vo.order.EmailTemplateQueryVO;
12	-import com.order.erp.domain.vo.order.EmailTemplateVO;
13	-import com.order.erp.mapper.order.EmailTemplateMapper;
14	-import com.order.erp.service.order.EmailTemplateService;
15	-import lombok.extern.slf4j.Slf4j;
16	-import org.springframework.stereotype.Service;
17	-
18	-import java.util.List;
19	-import java.util.Objects;
20	-
21	-/**
22	- * 邮件模板表(EmailTemplate)表服务实现类
23	- *
24	- * @author makejava
25	- * @since 2024-07-03 10:58:28
26	- */
27	-@Slf4j
28	-@Service
29	-public class EmailTemplateServiceImpl extends ServiceImpl<EmailTemplateMapper, EmailTemplateDO> implements EmailTemplateService {
30	-
31	-
32	- /**
33	- * 通过ID查询单条数据
34	- * <p>
35	- * emailTemplateQueryVO 主键
36	- *
37	- * @return 实例对象
38	- */
39	- @Override
40	- public ServerResult queryById(EmailTemplateQueryVO emailTemplateQueryVO) {
41	- if (Objects.isNull(emailTemplateQueryVO.getId())) {
42	- return ServerResult.fail("id 不能为空");
43	- }
44	- EmailTemplateDO EmailTemplateDo = getById(emailTemplateQueryVO.getId());
45	- if (Objects.isNull(EmailTemplateDo)) {
46	- return ServerResult.success(null);
47	- }
48	- return ServerResult.success(BeanUtil.copyProperties(EmailTemplateDo, EmailTemplateVO.class));
49	- }
50	-
51	- /**
52	- * 分页查询
53	- *
54	- * @param emailTemplateQueryVO 筛选条件
55	- * @return 查询结果
56	- */
57	- @Override
58	- public ServerResult list(EmailTemplateQueryVO emailTemplateQueryVO) {
59	-
60	- //todo
61	- return ServerResult.success(PageUtils.getPageReturn(null, emailTemplateQueryVO));
62	- }
63	-
64	- /**
65	- * 新增数据
66	- *
67	- * @param emailTemplateVO 实例对象
68	- * @return 实例对象
69	- */
70	- @Override
71	- public ServerResult add(EmailTemplateVO emailTemplateVO) {
72	- //todo 校验
73	- if (Objects.nonNull(emailTemplateVO.getId())) {
74	- emailTemplateVO.setId(null);
75	- }
76	- EmailTemplateDO emailTemplateDo = BeanUtil.copyProperties(emailTemplateVO, EmailTemplateDO.class);
77	-
78	- save(emailTemplateDo);
79	-
80	- return ServerResult.success();
81	- }
82	-
83	- /**
84	- * 修改数据
85	- *
86	- * @param emailTemplateVO 实例对象
87	- * @return 实例对象
88	- */
89	- @Override
90	- public ServerResult edit(EmailTemplateVO emailTemplateVO) {
91	- //todo 校验
92	- if (Objects.isNull(emailTemplateVO.getId())) {
93	- return ServerResult.fail("id 不能为空");
94	- }
95	- EmailTemplateDO emailTemplateDo = BeanUtil.copyProperties(emailTemplateVO, EmailTemplateDO.class);
96	-
97	- updateById(emailTemplateDo);
98	-
99	- return ServerResult.success();
100	- }
101	-
102	- /**
103	- * 通过主键删除数据
104	- *
105	- * @param emailTemplateQueryVO 筛选条件
106	- * @return 是否成功
107	- */
108	- @Override
109	- public ServerResult deleteById(EmailTemplateQueryVO emailTemplateQueryVO) {
110	- List<Long> ids = emailTemplateQueryVO.getIds();
111	- if (CollUtil.isEmpty(ids)) {
112	- return ServerResult.fail("ids 参数不能为空");
113	- }
114	- List<EmailTemplateDO> emailTemplateList = listByIds(ids);
115	- if (CollUtil.isEmpty(emailTemplateList)) {
116	- return ServerResult.success();
117	- }
118	- //todo 校验是否可以逻辑删除
119	- LambdaUpdateWrapper<EmailTemplateDO> updateWrapper = new LambdaUpdateWrapper<EmailTemplateDO>()
120	- .in(EmailTemplateDO::getId, ids)
121	- .set(EmailTemplateDO::getEnableFlag, Constant.UNABLE_TWENTY);
122	- update(updateWrapper);
123	- return ServerResult.success();
124	- }
125	-}

src/main/java/com/order/erp/service/order/impl/InvoiceBillMappingServiceImpl.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order.impl;
2	-
3	-import cn.hutool.core.bean.BeanUtil;
4	-import cn.hutool.core.collection.CollUtil;
5	-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
6	-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
7	-import com.baomidou.mybatisplus.core.metadata.IPage;
8	-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9	-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
10	-import com.order.erp.common.constant.Constant;
11	-import com.order.erp.common.constant.ServerResult;
12	-import com.order.erp.common.utils.PageUtils;
13	-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
14	-import com.order.erp.domain.vo.order.InvoiceBillMappingQueryVO;
15	-import com.order.erp.domain.vo.order.InvoiceBillMappingVO;
16	-import com.order.erp.mapper.order.InvoiceBillMappingMapper;
17	-import com.order.erp.service.order.InvoiceBillMappingService;
18	-import lombok.extern.slf4j.Slf4j;
19	-import org.springframework.stereotype.Service;
20	-
21	-import java.util.List;
22	-import java.util.Objects;
23	-
24	-/**
25	- * 应收款账单关联订单映射表(InvoiceBillMapping)表服务实现类
26	- *
27	- * @author makejava
28	- * @since 2024-08-05 16:26:36
29	- */
30	-@Slf4j
31	-@Service
32	-public class InvoiceBillMappingServiceImpl extends ServiceImpl<InvoiceBillMappingMapper, InvoiceBillMappingDO> implements InvoiceBillMappingService {
33	-
34	-
35	- /**
36	- * 通过ID查询单条数据
37	- * <p>
38	- * invoiceBillMappingQueryVO 主键
39	- *
40	- * @return 实例对象
41	- */
42	- @Override
43	- public ServerResult queryById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
44	- if (Objects.isNull(invoiceBillMappingQueryVO.getId())) {
45	- return ServerResult.fail("id 不能为空");
46	- }
47	- InvoiceBillMappingDO InvoiceBillMappingDo = getById(invoiceBillMappingQueryVO.getId());
48	- if (Objects.isNull(InvoiceBillMappingDo)) {
49	- return ServerResult.success(null);
50	- }
51	- return ServerResult.success(BeanUtil.copyProperties(InvoiceBillMappingDo, InvoiceBillMappingVO.class));
52	- }
53	-
54	- /**
55	- * 分页查询
56	- *
57	- * @param invoiceBillMappingQueryVO 筛选条件
58	- * @return 查询结果
59	- */
60	- @Override
61	- public ServerResult list(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
62	-
63	- LambdaQueryWrapper<InvoiceBillMappingDO> queryWapper = new LambdaQueryWrapper<InvoiceBillMappingDO>()
64	- .eq(InvoiceBillMappingDO::getEnableFlag, Constant.ENABLE_TEN)
65	- .orderByDesc(InvoiceBillMappingDO::getId);
66	- Page page = new Page<>(invoiceBillMappingQueryVO.getPage(), invoiceBillMappingQueryVO.getPageSize());
67	- IPage<InvoiceBillMappingDO> iPage = page(page, queryWapper);
68	- invoiceBillMappingQueryVO.setTotal(Long.valueOf(iPage.getTotal()).intValue());
69	- return ServerResult.success(PageUtils.getPageReturn(null, invoiceBillMappingQueryVO));
70	- }
71	-
72	- /**
73	- * 新增数据
74	- *
75	- * @param invoiceBillMappingVO 实例对象
76	- * @return 实例对象
77	- */
78	- @Override
79	- public ServerResult add(InvoiceBillMappingVO invoiceBillMappingVO) {
80	- //todo 校验
81	- if (Objects.nonNull(invoiceBillMappingVO.getId())) {
82	- invoiceBillMappingVO.setId(null);
83	- }
84	- InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
85	-
86	- save(invoiceBillMappingDo);
87	-
88	- return ServerResult.success();
89	- }
90	-
91	- /**
92	- * 修改数据
93	- *
94	- * @param invoiceBillMappingVO 实例对象
95	- * @return 实例对象
96	- */
97	- @Override
98	- public ServerResult edit(InvoiceBillMappingVO invoiceBillMappingVO) {
99	- //todo 校验
100	- if (Objects.isNull(invoiceBillMappingVO.getId())) {
101	- return ServerResult.fail("id 不能为空");
102	- }
103	- InvoiceBillMappingDO invoiceBillMappingDo = BeanUtil.copyProperties(invoiceBillMappingVO, InvoiceBillMappingDO.class);
104	-
105	- updateById(invoiceBillMappingDo);
106	-
107	- return ServerResult.success();
108	- }
109	-
110	- /**
111	- * 通过主键删除数据
112	- *
113	- * @param invoiceBillMappingQueryVO 筛选条件
114	- * @return 是否成功
115	- */
116	- @Override
117	- public ServerResult deleteById(InvoiceBillMappingQueryVO invoiceBillMappingQueryVO) {
118	- List<Long> ids = invoiceBillMappingQueryVO.getIds();
119	- if (CollUtil.isEmpty(ids)) {
120	- return ServerResult.fail("ids 参数不能为空");
121	- }
122	- List<InvoiceBillMappingDO> invoiceBillMappingList = listByIds(ids);
123	- if (CollUtil.isEmpty(invoiceBillMappingList)) {
124	- return ServerResult.success();
125	- }
126	- //todo 校验是否可以逻辑删除
127	- LambdaUpdateWrapper<InvoiceBillMappingDO> updateWrapper = new LambdaUpdateWrapper<InvoiceBillMappingDO>()
128	- .in(InvoiceBillMappingDO::getId, ids)
129	- .set(InvoiceBillMappingDO::getEnableFlag, Constant.UNABLE_TWENTY);
130	- update(updateWrapper);
131	- return ServerResult.success();
132	- }
133	-}

src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order.impl;
2	-
3	-import cn.hutool.core.collection.CollUtil;
4	-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5	-import com.baomidou.mybatisplus.core.metadata.IPage;
6	-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
7	-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8	-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9	-import com.order.erp.common.constant.Constant;
10	-import com.order.erp.common.constant.ServerResult;
11	-import com.order.erp.common.exception.BusinessException;
12	-import com.order.erp.common.utils.StringUtils;
13	-import com.order.erp.common.utils.TransactionHelper;
14	-import com.order.erp.domain.dto.BaseDO;
15	-import com.order.erp.domain.dto.order.InvoiceBillMappingDO;
16	-import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
17	-import com.order.erp.domain.dto.order.OrderBaseInfoDO;
18	-import com.order.erp.domain.vo.order.*;
19	-import com.order.erp.mapper.order.InvoiceBillOrderMapper;
20	-import com.order.erp.service.order.InvoiceBillMappingService;
21	-import com.order.erp.service.order.InvoiceBillOrderService;
22	-import com.order.erp.service.order.OrderBaseInfoService;
23	-import lombok.extern.slf4j.Slf4j;
24	-import org.springframework.stereotype.Service;
25	-
26	-import javax.annotation.Resource;
27	-import java.util.*;
28	-import java.util.stream.Collectors;
29	-
30	-/**
31	- * 应收款账单表(InvoiceBillOrder)表服务实现类
32	- *
33	- * @author makejava
34	- * @since 2024-08-05 16:26:34
35	- */
36	-@Slf4j
37	-@Service
38	-public class InvoiceBillOrderServiceImpl extends ServiceImpl<InvoiceBillOrderMapper, InvoiceBillOrderDO> implements InvoiceBillOrderService {
39	-
40	-
41	- @Resource
42	- private OrderBaseInfoService orderBaseInfoService;
43	-
44	- @Resource
45	- private InvoiceBillMappingService invoiceBillMappingService;
46	-
47	- @Resource
48	- private TransactionHelper transactionHelper;
49	-
50	-
51	- /**
52	- * 分页查询
53	- *
54	- * @param queryVO 筛选条件
55	- * @return 查询结果
56	- */
57	- @Override
58	- public ServerResult listByPage(InvoiceBillOrderQueryVO queryVO) {
59	- Set<Long> billOrderIds = filterBillOrderIdsBy(queryVO);
60	-
61	- LambdaQueryWrapper<InvoiceBillOrderDO> queryWrapper = new LambdaQueryWrapper<InvoiceBillOrderDO>()
62	- .eq(InvoiceBillOrderDO::getEnableFlag, Constant.ENABLE_TEN)
63	- .in(CollectionUtils.isNotEmpty(billOrderIds), InvoiceBillOrderDO::getId, billOrderIds)
64	- .eq(StringUtils.isNotBlank(queryVO.getInvoiceNo()), InvoiceBillOrderDO::getInvoiceNo, queryVO.getInvoiceNo())
65	- .eq(Objects.nonNull(queryVO.getStatus()), InvoiceBillOrderDO::getStatus, queryVO.getStatus())
66	- .orderByDesc(InvoiceBillOrderDO::getId);
67	- Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
68	- IPage<InvoiceBillOrderDO> iPage = page(page, queryWrapper);
69	- return ServerResult.success(iPage);
70	- }
71	-
72	- @Override
73	- public ServerResult listBaseOrderInfoBy(InvoiceBaseOrderQueryVO queryVO) {
74	- List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>()
75	- .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
76	- .eq(InvoiceBillMappingDO::getInvoiceNo, queryVO.getInvoiceNo()));
77	- if (CollectionUtils.isEmpty(mappingDOS)) {
78	- return ServerResult.success();
79	- }
80	- Set<Long> orderIds = mappingDOS.stream().map(InvoiceBillMappingDO::getOrderId).collect(Collectors.toSet());
81	- return ServerResult.success(orderBaseInfoService.listByIds(orderIds));
82	- }
83	-
84	- /**
85	- * @param queryVO
86	- * @return
87	- */
88	- private Set<Long> filterBillOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
89	- List<Long> orderIds = filterOrderIdsBy(queryVO);
90	- if (CollectionUtils.isEmpty(orderIds)) {
91	- return null;
92	- }
93	- List<InvoiceBillMappingDO> mappingDOS = invoiceBillMappingService.list(new LambdaQueryWrapper<InvoiceBillMappingDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
94	- .in(CollectionUtils.isNotEmpty(orderIds), InvoiceBillMappingDO::getOrderId, orderIds));
95	- if (CollectionUtils.isEmpty(mappingDOS)) {
96	- Set<Long> ids = new HashSet<>();
97	- ids.add(-1L);
98	- return ids;
99	- }
100	- return mappingDOS.stream().map(InvoiceBillMappingDO::getInvoiceBillId).collect(Collectors.toSet());
101	- }
102	-
103	- /**
104	- * @param queryVO
105	- * @return
106	- */
107	- private List<Long> filterOrderIdsBy(InvoiceBillOrderQueryVO queryVO) {
108	- Boolean flag = false;
109	- if (StringUtils.isNotBlank(queryVO.getCustomerCode())) {
110	- flag = flag \| true;
111	- }
112	- if (StringUtils.isNotBlank(queryVO.getProductionDepartment())) {
113	- flag = flag \| true;
114	- }
115	- if (StringUtils.isNotBlank(queryVO.getCustomerPo())) {
116	- flag = flag \| true;
117	- }
118	- if (StringUtils.isNotBlank(queryVO.getInnerNo())) {
119	- flag = flag \| true;
120	- }
121	- if (StringUtils.isNotBlank(queryVO.getProjectNo())) {
122	- flag = flag \| true;
123	- }
124	- if (!flag) {
125	- return null;
126	- }
127	- LambdaQueryWrapper<OrderBaseInfoDO> queryWrapper = new LambdaQueryWrapper<OrderBaseInfoDO>()
128	- .eq(OrderBaseInfoDO::getEnableFlag, Constant.ENABLE_TEN)
129	- .eq(StringUtils.isNotBlank(queryVO.getCustomerCode()), OrderBaseInfoDO::getCustomerCode, queryVO.getCustomerCode())
130	- .eq(StringUtils.isNotBlank(queryVO.getProductionDepartment()), OrderBaseInfoDO::getProductionDepartment, queryVO.getProductionDepartment())
131	- .eq(StringUtils.isNotBlank(queryVO.getCustomerPo()), OrderBaseInfoDO::getCustomerPo, queryVO.getCustomerPo())
132	- .eq(StringUtils.isNotBlank(queryVO.getInnerNo()), OrderBaseInfoDO::getInnerNo, queryVO.getInnerNo())
133	- .eq(StringUtils.isNotBlank(queryVO.getProjectNo()), OrderBaseInfoDO::getProjectNo, queryVO.getProjectNo());
134	- List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.list(queryWrapper);
135	- if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
136	- List<Long> orderIds = new ArrayList<>();
137	- orderIds.add(-1L);
138	- return orderIds;
139	- }
140	- return orderBaseInfoDOList.stream().map(OrderBaseInfoDO::getId).collect(Collectors.toList());
141	- }
142	-
143	- /**
144	- * 创建invoice单据
145	- *
146	- * @param createVO 实例对象
147	- * @return 实例对象
148	- */
149	- @Override
150	- public ServerResult create(InvoiceBillCreateVO createVO) {
151	- if (Objects.nonNull(createVO.getId())) {
152	- createVO.setId(null);
153	- }
154	-
155	- validaBillOrder(createVO);
156	-
157	- InvoiceBillOrderDO invoiceBillOrderDO = buildInvoiceBillOrderDO(createVO);
158	-
159	- transactionHelper.run(() -> {
160	- save(invoiceBillOrderDO);
161	-
162	- invoiceBillMappingService.saveBatch(buildInvoiceBillMappingDOS(createVO, invoiceBillOrderDO));
163	- });
164	-
165	- return ServerResult.success();
166	- }
167	-
168	- /**
169	- * @param createVO
170	- * @return
171	- */
172	- private InvoiceBillOrderDO buildInvoiceBillOrderDO(InvoiceBillCreateVO createVO) {
173	- return InvoiceBillOrderDO.builder()
174	- .invoiceNo(createVO.getInvoiceNo())
175	- .bgUrl(createVO.getBgUrl())
176	- .backRefundDate(createVO.getBackRefundDate())
177	- .build();
178	- }
179	-
180	- /**
181	- * @param createVO
182	- * @param invoiceBillOrderDO
183	- * @return
184	- */
185	- private List<InvoiceBillMappingDO> buildInvoiceBillMappingDOS(InvoiceBillCreateVO createVO, InvoiceBillOrderDO invoiceBillOrderDO) {
186	- return createVO.getOrderIds().stream().map(x -> {
187	- return InvoiceBillMappingDO.builder()
188	- .orderId(x)
189	- .invoiceBillId(invoiceBillOrderDO.getId())
190	- .invoiceNo(invoiceBillOrderDO.getInvoiceNo())
191	- .build();
192	- }).collect(Collectors.toList());
193	- }
194	-
195	- /**
196	- * @param createVO
197	- */
198	- private void validaBillOrder(InvoiceBillCreateVO createVO) {
199	- if (CollectionUtils.isEmpty(createVO.getOrderIds())) {
200	- throw new BusinessException("请勾选订单！");
201	- }
202	-
203	- List<OrderBaseInfoDO> orderBaseInfoDOList = orderBaseInfoService.listByIds(createVO.getOrderIds());
204	- if (CollectionUtils.isEmpty(orderBaseInfoDOList)) {
205	- throw new BusinessException("勾选的订单信息不存在！");
206	- }
207	-
208	- if (orderBaseInfoDOList.size() != createVO.getOrderIds().size()) {
209	- throw new BusinessException("勾选的订单信息有误！");
210	- }
211	-
212	- String invoiceNo = createVO.getInvoiceNo();
213	-
214	- List<InvoiceBillOrderDO> invoiceBillOrderDOS = list(new LambdaQueryWrapper<InvoiceBillOrderDO>()
215	- .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
216	- .eq(InvoiceBillOrderDO::getInvoiceNo, invoiceNo));
217	- if (CollectionUtils.isNotEmpty(invoiceBillOrderDOS)) {
218	- throw new BusinessException("存在相同的invoice订单！");
219	- }
220	-
221	- }
222	-
223	- /**
224	- * 修改数据
225	- *
226	- * @param deductInfoVO 实例对象
227	- * @return 实例对象
228	- */
229	- @Override
230	- public ServerResult updateDeductInfo(InvoiceBillDeductInfoVO deductInfoVO) {
231	- if (Objects.isNull(deductInfoVO.getId())) {
232	- throw new BusinessException("id 不能为空");
233	- }
234	- InvoiceBillOrderDO invoiceBillOrderDo = getById(deductInfoVO.getId());
235	- if (Objects.isNull(invoiceBillOrderDo)) {
236	- throw new BusinessException("应收款单据不存在");
237	- }
238	- invoiceBillOrderDo.setDeductUrl(deductInfoVO.getDeductUrl());
239	- invoiceBillOrderDo.setDeductAmount(deductInfoVO.getDeductAmount());
240	- updateById(invoiceBillOrderDo);
241	- return ServerResult.success();
242	- }
243	-
244	- @Override
245	- public ServerResult updateAmountInfo(InvoiceBillAmountInfoVO amountInfoVO) {
246	- if (Objects.isNull(amountInfoVO.getId())) {
247	- throw new BusinessException("id 不能为空");
248	- }
249	- InvoiceBillOrderDO invoiceBillOrderDo = getById(amountInfoVO.getId());
250	- if (Objects.isNull(invoiceBillOrderDo)) {
251	- throw new BusinessException("应收款单据不存在");
252	- }
253	- invoiceBillOrderDo.setBgUrl(amountInfoVO.getBgUrl());
254	- invoiceBillOrderDo.setActualReceivableAmount(amountInfoVO.getActualReceivableAmount());
255	- invoiceBillOrderDo.setActualPayedAmount1(amountInfoVO.getActualPayedAmount1());
256	- invoiceBillOrderDo.setActualPayedAmount2(amountInfoVO.getActualPayedAmount2());
257	- invoiceBillOrderDo.setActualPayedAmount3(amountInfoVO.getActualPayedAmount3());
258	- invoiceBillOrderDo.setOtherAmount(amountInfoVO.getOtherAmount());
259	- updateById(invoiceBillOrderDo);
260	- return ServerResult.success();
261	- }
262	-
263	- /**
264	- * 通过主键删除数据
265	- *
266	- * @param invoiceBillOrderQueryVO 筛选条件
267	- * @return 是否成功
268	- */
269	- @Override
270	- public ServerResult deleteById(InvoiceBillOrderQueryVO invoiceBillOrderQueryVO) {
271	- List<Long> ids = invoiceBillOrderQueryVO.getIds();
272	- if (CollUtil.isEmpty(ids)) {
273	- return ServerResult.fail("ids 参数不能为空");
274	- }
275	- List<InvoiceBillOrderDO> invoiceBillOrderList = listByIds(ids);
276	- if (CollUtil.isEmpty(invoiceBillOrderList)) {
277	- return ServerResult.success();
278	- }
279	- transactionHelper.run(() -> {
280	- removeByIds(ids);
281	- invoiceBillMappingService.remove(new LambdaQueryWrapper<InvoiceBillMappingDO>().in(InvoiceBillMappingDO::getInvoiceBillId, ids));
282	- });
283	-
284	- return ServerResult.success();
285	- }
286	-}

src/main/java/com/order/erp/service/order/impl/OrderAuditLogServiceImpl.java deleted 100644 → 0

View file @8e2b347

1	-package com.order.erp.service.order.impl;
2	-
3	-import cn.hutool.core.bean.BeanUtil;
4	-import cn.hutool.core.collection.CollUtil;
5	-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
6	-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
7	-import com.baomidou.mybatisplus.core.metadata.IPage;
8	-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
9	-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
10	-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
11	-import com.order.erp.common.constant.Constant;
12	-import com.order.erp.common.constant.ServerResult;
13	-import com.order.erp.domain.dto.BaseDO;
14	-import com.order.erp.domain.dto.admin.AdminUserDO;
15	-import com.order.erp.domain.dto.order.OrderAuditLogDO;
16	-import com.order.erp.domain.dto.order.OrderFieldLockApplyDO;
17	-import com.order.erp.domain.vo.order.OrderAuditLogQueryVO;
18	-import com.order.erp.domain.vo.order.OrderAuditLogResultVO;
19	-import com.order.erp.domain.vo.order.OrderAuditLogVO;
20	-import com.order.erp.mapper.order.OrderAuditLogMapper;
21	-import com.order.erp.service.admin.AdminUserService;
22	-import com.order.erp.service.order.OrderAuditLogService;
23	-import com.order.erp.service.order.OrderFieldLockApplyService;
24	-import lombok.extern.slf4j.Slf4j;
25	-import org.springframework.beans.BeanUtils;
26	-import org.springframework.stereotype.Service;
27	-
28	-import javax.annotation.Resource;
29	-import java.util.*;
30	-import java.util.function.Function;
31	-import java.util.stream.Collectors;
32	-
33	-/**
34	- * 用户订单审批日志表(OrderAuditLog)表服务实现类
35	- *
36	- * @author makejava
37	- * @since 2023-09-08 15:26:42
38	- */
39	-@Slf4j
40	-@Service
41	-public class OrderAuditLogServiceImpl extends ServiceImpl<OrderAuditLogMapper, OrderAuditLogDO> implements OrderAuditLogService {
42	-
43	-
44	- @Resource
45	- private AdminUserService userService;
46	-
47	- @Resource
48	- private OrderFieldLockApplyService applyService;
49	-
50	- /**
51	- * 通过ID查询单条数据
52	- * <p>
53	- * orderAuditLogQueryVO 主键
54	- *
55	- * @return 实例对象
56	- */
57	- @Override
58	- public ServerResult queryById(OrderAuditLogQueryVO orderAuditLogQueryVO) {
59	- if (Objects.isNull(orderAuditLogQueryVO.getId())) {
60	- return ServerResult.fail("id 不能为空");
61	- }
62	- OrderAuditLogDO OrderAuditLogDo = getById(orderAuditLogQueryVO.getId());
63	- if (Objects.isNull(OrderAuditLogDo)) {
64	- return ServerResult.success(null);
65	- }
66	- return ServerResult.success(BeanUtil.copyProperties(OrderAuditLogDo, OrderAuditLogVO.class));
67	- }
68	-
69	- /**
70	- * 分页查询
71	- *
72	- * @param orderAuditLogQueryVO 筛选条件
73	- * @return 查询结果
74	- */
75	- @Override
76	- public ServerResult list(OrderAuditLogQueryVO orderAuditLogQueryVO) {
77	-
78	- return ServerResult.success();
79	- }
80	-
81	- @Override
82	- public ServerResult listByPage(OrderAuditLogQueryVO queryVO) {
83	- LambdaQueryWrapper<OrderAuditLogDO> queryWrapper = buildQueryByParam(queryVO);
84	- Page page = new Page<>(queryVO.getPage(), queryVO.getPageSize());
85	- IPage<OrderAuditLogDO> iPage = page(page, queryWrapper);
86	-
87	- Page<OrderAuditLogResultVO> webVOPage = new Page<>();
88	- List<OrderAuditLogDO> auditLogDOS = iPage.getRecords();
89	- if (CollectionUtils.isNotEmpty(auditLogDOS)) {
90	- Set<Long> applyIds = auditLogDOS.stream().map(OrderAuditLogDO::getApplyId).collect(Collectors.toSet());
91	- Map<Long, AdminUserDO> userDOMap = new HashMap<>();
92	- Map<Long, OrderFieldLockApplyDO> applyDOMap = new HashMap<>();
93	- Set<Long> userIds = new HashSet<>();
94	- if (CollectionUtils.isNotEmpty(applyIds)) {
95	- List<OrderFieldLockApplyDO> applyDOS = applyService.listByIds(applyIds);
96	- if (CollectionUtils.isNotEmpty(applyDOS)) {
97	- userIds.addAll(applyDOS.stream().map(OrderFieldLockApplyDO::getApplyUserId).collect(Collectors.toSet()));
98	- userIds.addAll(applyDOS.stream().map(OrderFieldLockApplyDO::getAuditUserId).collect(Collectors.toSet()));
99	- applyDOMap = applyDOS.stream().collect(Collectors.toMap(OrderFieldLockApplyDO::getId, Function.identity()));
100	- }
101	- }
102	- if (CollectionUtils.isNotEmpty(userIds)) {
103	- List<AdminUserDO> userDOS = userService.listByIds(userIds);
104	- if (CollectionUtils.isNotEmpty(userDOS)) {
105	- userDOMap = userDOS.stream().collect(Collectors.toMap(AdminUserDO::getId, Function.identity()));
106	- }
107	- }
108	- Map<Long, AdminUserDO> finalUserDOMap = userDOMap;
109	- Map<Long, OrderFieldLockApplyDO> finalApplyDOMap = applyDOMap;
110	- List<OrderAuditLogResultVO> resultVOList = auditLogDOS.stream().map(x -> {
111	- OrderAuditLogResultVO resultVO = new OrderAuditLogResultVO();
112	- BeanUtils.copyProperties(x, resultVO);
113	- if (finalApplyDOMap.containsKey(x.getApplyId())) {
114	- OrderFieldLockApplyDO applyDO = finalApplyDOMap.get(x.getApplyId());
115	- if (finalUserDOMap.containsKey(applyDO.getApplyUserId())) {
116	- resultVO.setApplyUserName(finalUserDOMap.get(applyDO.getApplyUserId()).getUserName());
117	- }
118	- if (finalUserDOMap.containsKey(applyDO.getAuditUserId())) {
119	- resultVO.setAuditUserName(finalUserDOMap.get(applyDO.getAuditUserId()).getUserName());
120	- }
121	- resultVO.setApplyRemark(applyDO.getRemark());
122	- resultVO.setFields(applyDO.getFields());
123	- }
124	- return resultVO;
125	- }).collect(Collectors.toList());
126	-
127	- webVOPage.setRecords(resultVOList);
128	- }
129	- BeanUtils.copyProperties(page, webVOPage, "records");
130	- return ServerResult.success(webVOPage);
131	- }
132	-
133	- /**
134	- * @param queryVO
135	- * @return
136	- */
137	- private LambdaQueryWrapper<OrderAuditLogDO> buildQueryByParam(OrderAuditLogQueryVO queryVO) {
138	- return new LambdaQueryWrapper<OrderAuditLogDO>()
139	- .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
140	- .eq(Objects.nonNull(queryVO.getOrderId()), OrderAuditLogDO::getOrderId, queryVO.getOrderId())
141	- .orderByDesc(OrderAuditLogDO::getId)
142	- ;
143	- }
144	-
145	- /**
146	- * 新增数据
147	- *
148	- * @param orderAuditLogVO 实例对象
149	- * @return 实例对象
150	- */
151	- @Override
152	- public ServerResult add(OrderAuditLogVO orderAuditLogVO) {
153	- //todo 校验
154	- if (Objects.nonNull(orderAuditLogVO.getId())) {
155	- orderAuditLogVO.setId(null);
156	- }
157	- OrderAuditLogDO orderAuditLogDo = BeanUtil.copyProperties(orderAuditLogVO, OrderAuditLogDO.class);
158	-
159	- save(orderAuditLogDo);
160	-
161	- return ServerResult.success();
162	- }
163	-
164	- /**
165	- * 修改数据
166	- *
167	- * @param orderAuditLogVO 实例对象
168	- * @return 实例对象
169	- */
170	- @Override
171	- public ServerResult edit(OrderAuditLogVO orderAuditLogVO) {
172	- //todo 校验
173	- if (Objects.isNull(orderAuditLogVO.getId())) {
174	- return ServerResult.fail("id 不能为空");
175	- }
176	- OrderAuditLogDO orderAuditLogDo = BeanUtil.copyProperties(orderAuditLogVO, OrderAuditLogDO.class);
177	-
178	- updateById(orderAuditLogDo);
179	-
180	- return ServerResult.success();
181	- }
182	-
183	- /**
184	- * 通过主键删除数据
185	- *
186	- * @param orderAuditLogQueryVO 筛选条件
187	- * @return 是否成功
188	- */
189	- @Override
190	- public ServerResult deleteById(OrderAuditLogQueryVO orderAuditLogQueryVO) {
191	- List<Long> ids = orderAuditLogQueryVO.getIds();
192	- if (CollUtil.isEmpty(ids)) {
193	- return ServerResult.fail("ids 参数不能为空");
194	- }
195	- List<OrderAuditLogDO> orderAuditLogList = listByIds(ids);
196	- if (CollUtil.isEmpty(orderAuditLogList)) {
197	- return ServerResult.success();
198	- }
199	- //todo 校验是否可以逻辑删除
200	- LambdaUpdateWrapper<OrderAuditLogDO> updateWrapper = new LambdaUpdateWrapper<OrderAuditLogDO>()
201	- .in(OrderAuditLogDO::getId, ids)
202	- .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
203	- update(updateWrapper);
204	- return ServerResult.success();
205	- }
206	-
207	- /**
208	- * 逻辑删除，通过订单id删除用户订单审批日志表(OrderAuditLog)实体类
209	- *
210	- * @param orderId
211	- * @return
212	- */
213	- @Override
214	- public boolean deleteByOrderId(Long orderId) {
215	- LambdaUpdateWrapper<OrderAuditLogDO> updateWrapper = new LambdaUpdateWrapper<OrderAuditLogDO>()
216	- .eq(OrderAuditLogDO::getOrderId, orderId)
217	- .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
218	- return update(updateWrapper);
219	- }
220	-
221	- @Override
222	- public boolean deleteByOrderIds(List<Long> orderIds) {
223	- LambdaUpdateWrapper<OrderAuditLogDO> updateWrapper = new LambdaUpdateWrapper<OrderAuditLogDO>()
224	- .in(OrderAuditLogDO::getOrderId, orderIds)
225	- .set(OrderAuditLogDO::getEnableFlag, Constant.UNABLE_TWENTY);
226	- return update(updateWrapper);
227	- }
228	-}

canrd-outside / order-erp · Commits

GitLab

feat: ERP升级

Too many changes to show.
Reload with full diff Plain diff Email patch

GitLab

feat: ERP升级

Too many changes to show. Reload with full diff Plain diff Email patch

Too many changes to show.
Reload with full diff Plain diff Email patch