From e02645531a39d9d1f7ddd4a732c35db11e0440d6 Mon Sep 17 00:00:00 2001 From: shenyifei Date: Wed, 14 Jan 2026 11:50:13 +0800 Subject: [PATCH] =?UTF-8?q?refactor(payment):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E4=BB=98=E6=AC=BE=E7=9B=B8=E5=85=B3=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E5=92=8C=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将账户类别和账户类型字段从Boolean改为枚举类型 - 重命名回款时间为支付时间(paidAt)，回款金额为支付金额(paidAmount) - 新增支付凭证字段用于存储回款凭证列表 - 在查询参数中新增经销商ID、公司ID、账户名称、账户号码等筛选条件 - 添加订单供应商查询中的名称、发货日期、发票日期筛选功能 - 在供应商发票查询中支持按订单供应商ID、订单ID和登记时间筛选 - 更新数据访问层实现以支持新的查询条件和关联查询 - 修改SQL映射文件中的字段名称和查询逻辑 - 在费用记录网关中新增车辆数量和记录日期字段 --- .../ReconciliationPaymentAssembler.java | 3 ++ .../domain/entity/ReconciliationPayment.java | 20 ++++++++--- .../convert/ReconciliationPaymentConvert.java | 6 ++++ .../entity/ReconciliationPaymentDO.java | 8 ++++- .../gateway/ExpenseRecordGatewayImpl.java | 3 ++ .../gateway/OrderSupplierGatewayImpl.java | 2 ++ .../ReconciliationPaymentGatewayImpl.java | 36 +++++++++++++++++++ .../gateway/SupplierInvoiceGatewayImpl.java | 9 +++++ .../resources/mapper/OrderSupplierMapper.xml | 18 ++++++---- .../resources/mapper/ReconciliationMapper.xml | 3 +- .../mapper/ReconciliationPaymentMapper.xml | 6 ++-- .../cmd/ReconciliationPaymentCreateCmd.java | 17 ++++++--- .../api/biz/dto/qry/OrderSupplierPageQry.java | 12 ++++--- .../dto/qry/ReconciliationPaymentPageQry.java | 20 +++++++++++ .../biz/dto/qry/SupplierInvoicePageQry.java | 9 +++++ .../biz/dto/vo/ReconciliationPaymentVO.java | 23 +++++++++--- 16 files changed, 168 insertions(+), 27 deletions(-) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationPaymentAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationPaymentAssembler.java index d9981e4..ac122fe 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationPaymentAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationPaymentAssembler.java @@ -3,6 +3,7 @@ package com.xunhong.erp.turbo.biz.app.assembler; import com.xunhong.erp.turbo.api.biz.dto.vo.ReconciliationPaymentVO; import com.xunhong.erp.turbo.biz.domain.entity.ReconciliationPayment; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.mapstruct.NullValueCheckStrategy; /** @@ -11,5 +12,7 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ReconciliationPaymentAssembler { + @Mapping(target = "dealerVO", source = "dealer") + @Mapping(target = "companyVO", source = "company") ReconciliationPaymentVO toReconciliationPaymentVO(ReconciliationPayment reconciliationPayment); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationPayment.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationPayment.java index 5a78503..96f4029 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationPayment.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationPayment.java @@ -2,11 +2,14 @@ package com.xunhong.erp.turbo.biz.domain.entity; import com.alibaba.cola.domain.Entity; import com.alibaba.cola.dto.DTO; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountCategoryEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * @author shenyifei @@ -44,12 +47,12 @@ public class ReconciliationPayment extends DTO { /** * 账户类别：1_对公账户；2_私人账户 */ - private Boolean accountCategory; + private CompanyPaymentAccountCategoryEnum accountCategory; /** * 账户类型：1_银行卡；2_支付宝；3_微信 */ - private Boolean accountType; + private CompanyPaymentAccountTypeEnum accountType; /** * 银行名称 @@ -74,12 +77,17 @@ public class ReconciliationPayment extends DTO { /** * 回款时间 */ - private LocalDateTime returnAt; + private LocalDateTime paidAt; /** * 回款金额 */ - private BigDecimal returnAmount; + private BigDecimal paidAmount; + + /** + * 回款凭证 + */ + private List paidCredentials; /** * 备注 @@ -91,5 +99,9 @@ public class ReconciliationPayment extends DTO { */ private LocalDateTime createdAt; + private Dealer dealer; + + private Company company; + } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationPaymentConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationPaymentConvert.java index a96040a..1d266b5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationPaymentConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationPaymentConvert.java @@ -15,14 +15,20 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ReconciliationPaymentConvert { + @Mapping(target = "dealer", source = "dealerDO") + @Mapping(target = "company", source = "companyDO") ReconciliationPayment toReconciliationPayment(ReconciliationPaymentDO reconciliationPaymentDO); + @Mapping(target = "dealerDO", ignore = true) + @Mapping(target = "companyDO", ignore = true) @Mapping(target = "version", ignore = true) @Mapping(target = "updatedAt", ignore = true) @Mapping(target = "isDelete", ignore = true) @Mapping(target = "createdAt", ignore = true) ReconciliationPaymentDO toReconciliationPaymentDO(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd); + @Mapping(target = "dealerDO", ignore = true) + @Mapping(target = "companyDO", ignore = true) @Mapping(target = "version", ignore = true) @Mapping(target = "updatedAt", ignore = true) @Mapping(target = "isDelete", ignore = true) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationPaymentDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationPaymentDO.java index 2ce941d..29e45ff 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationPaymentDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationPaymentDO.java @@ -19,7 +19,7 @@ import java.util.List; * @author shenyifei */ @Data -@TableName(value = "reconciliation_payment") +@TableName(value = "reconciliation_payment", autoResultMap = true) @EqualsAndHashCode(callSuper = true) public class ReconciliationPaymentDO extends BaseDO { @@ -113,5 +113,11 @@ public class ReconciliationPaymentDO extends BaseDO { @TableField(value = "remark") private String remark; + @TableField(exist = false) + private DealerDO dealerDO; + + @TableField(exist = false) + private CompanyDO companyDO; + } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ExpenseRecordGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ExpenseRecordGatewayImpl.java index 3b22809..0fbb59f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ExpenseRecordGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ExpenseRecordGatewayImpl.java @@ -255,6 +255,8 @@ public class ExpenseRecordGatewayImpl implements ExpenseRecordGateway { expenseRecord.setTotalProvision(orderCostDO.getPrice()); expenseRecord.setTotalExpense(BigDecimal.ZERO); expenseRecord.setDailyProfit(orderCostDO.getPrice()); + expenseRecord.setTotalVehicleCount(1); + expenseRecord.setRecordDate(today); expenseRecord.setCreatedAt(LocalDateTime.now()); expenseRecordMapper.insert(expenseRecord); } else { @@ -263,6 +265,7 @@ public class ExpenseRecordGatewayImpl implements ExpenseRecordGateway { BigDecimal newDailyProfit = newTotalProvision.subtract(expenseRecord.getTotalExpense()); expenseRecord.setTotalProvision(newTotalProvision); expenseRecord.setDailyProfit(newDailyProfit); + expenseRecord.setTotalVehicleCount(expenseRecord.getTotalVehicleCount() + 1); expenseRecordMapper.updateById(expenseRecord); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderSupplierGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderSupplierGatewayImpl.java index be83806..b917798 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderSupplierGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderSupplierGatewayImpl.java @@ -1,6 +1,7 @@ package com.xunhong.erp.turbo.biz.infrastructure.gateway; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -44,6 +45,7 @@ public class OrderSupplierGatewayImpl implements OrderSupplierGateway { @Override public IPage page(OrderSupplierPageQry orderSupplierPageQry) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(OrderSupplierDO.class); + queryWrapper.eq(StrUtil.isNotBlank(orderSupplierPageQry.getName()), OrderSupplierDO::getName, orderSupplierPageQry.getName()); queryWrapper.eq(Objects.nonNull(orderSupplierPageQry.getInvoiceUpload()), OrderSupplierDO::getInvoiceUpload, orderSupplierPageQry.getInvoiceUpload()); queryWrapper.eq(Objects.nonNull(orderSupplierPageQry.getInvoiceId()), OrderSupplierDO::getInvoiceId, orderSupplierPageQry.getInvoiceId()); queryWrapper.eq(Objects.nonNull(orderSupplierPageQry.getIsPaid()), OrderSupplierDO::getIsPaid, orderSupplierPageQry.getIsPaid()); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationPaymentGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationPaymentGatewayImpl.java index 06fa4ff..fa4adf6 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationPaymentGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationPaymentGatewayImpl.java @@ -1,5 +1,7 @@ package com.xunhong.erp.turbo.biz.infrastructure.gateway; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -13,12 +15,21 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.ReconciliationPaymentShowQry; import com.xunhong.erp.turbo.biz.domain.entity.ReconciliationPayment; import com.xunhong.erp.turbo.biz.domain.gateway.ReconciliationPaymentGateway; import com.xunhong.erp.turbo.biz.infrastructure.convert.ReconciliationPaymentConvert; +import com.xunhong.erp.turbo.biz.infrastructure.entity.CompanyDO; +import com.xunhong.erp.turbo.biz.infrastructure.entity.DealerDO; import com.xunhong.erp.turbo.biz.infrastructure.entity.ReconciliationPaymentDO; +import com.xunhong.erp.turbo.biz.infrastructure.mapper.CompanyMapper; +import com.xunhong.erp.turbo.biz.infrastructure.mapper.DealerMapper; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ReconciliationPaymentMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; /** * @author shenyifei @@ -29,6 +40,10 @@ public class ReconciliationPaymentGatewayImpl implements ReconciliationPaymentGa private final ReconciliationPaymentMapper reconciliationPaymentMapper; private final ReconciliationPaymentConvert reconciliationPaymentConvert; + private final DealerMapper dealerMapper; + + private final CompanyMapper companyMapper; + @Override public ReconciliationPayment save(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd) { ReconciliationPaymentDO reconciliationPaymentDO = reconciliationPaymentConvert.toReconciliationPaymentDO(reconciliationPaymentCreateCmd); @@ -40,11 +55,32 @@ public class ReconciliationPaymentGatewayImpl implements ReconciliationPaymentGa @Override public IPage page(ReconciliationPaymentPageQry reconciliationPaymentPageQry) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); + queryWrapper.eq(Objects.nonNull(reconciliationPaymentPageQry.getDealerId()), ReconciliationPaymentDO::getDealerId, reconciliationPaymentPageQry.getDealerId()); + queryWrapper.eq(Objects.nonNull(reconciliationPaymentPageQry.getCompanyId()), ReconciliationPaymentDO::getCompanyId, reconciliationPaymentPageQry.getCompanyId()); + queryWrapper.like(StrUtil.isNotBlank(reconciliationPaymentPageQry.getAccountName()), ReconciliationPaymentDO::getAccountName, reconciliationPaymentPageQry.getAccountName()); + queryWrapper.like(StrUtil.isNotBlank(reconciliationPaymentPageQry.getAccountNumber()), ReconciliationPaymentDO::getAccountNumber, reconciliationPaymentPageQry.getAccountNumber()); + queryWrapper.eq(Objects.nonNull(reconciliationPaymentPageQry.getAccountCategory()), ReconciliationPaymentDO::getAccountCategory, reconciliationPaymentPageQry.getAccountCategory()); + queryWrapper.eq(Objects.nonNull(reconciliationPaymentPageQry.getAccountType()), ReconciliationPaymentDO::getAccountType, reconciliationPaymentPageQry.getAccountType()); + queryWrapper.orderByDesc(ReconciliationPaymentDO::getCreatedAt); IPage page = new Page<>(reconciliationPaymentPageQry.getPageIndex(), reconciliationPaymentPageQry.getPageSize()); page = reconciliationPaymentMapper.selectPage(page, queryWrapper); + Set dealerIdList = page.getRecords().stream().map(ReconciliationPaymentDO::getDealerId).collect(Collectors.toSet()); + if (CollUtil.isNotEmpty(dealerIdList)) { + List dealerDOList = dealerMapper.selectByIds(dealerIdList); + Map dealerDOMap = dealerDOList.stream().collect(Collectors.toMap(DealerDO::getDealerId, Function.identity())); + page.getRecords().forEach(reconciliationPaymentDO -> reconciliationPaymentDO.setDealerDO(dealerDOMap.get(reconciliationPaymentDO.getDealerId()))); + } + + Set companyIdList = page.getRecords().stream().map(ReconciliationPaymentDO::getCompanyId).collect(Collectors.toSet()); + if (CollUtil.isNotEmpty(companyIdList)) { + List companyDOList = companyMapper.selectByIds(companyIdList); + Map companyDOMap = companyDOList.stream().collect(Collectors.toMap(CompanyDO::getCompanyId, Function.identity())); + page.getRecords().forEach(reconciliationPaymentDO -> reconciliationPaymentDO.setCompanyDO(companyDOMap.get(reconciliationPaymentDO.getCompanyId()))); + } + return page.convert(reconciliationPaymentConvert::toReconciliationPayment); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierInvoiceGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierInvoiceGatewayImpl.java index 3a5cfe3..cb334ab 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierInvoiceGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/SupplierInvoiceGatewayImpl.java @@ -62,6 +62,15 @@ public class SupplierInvoiceGatewayImpl implements SupplierInvoiceGateway { public IPage page(SupplierInvoicePageQry supplierInvoicePageQry) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(SupplierInvoiceDO.class); queryWrapper.eq(Objects.nonNull(supplierInvoicePageQry.getSupplierId()), SupplierInvoiceDO::getSupplierId, supplierInvoicePageQry.getSupplierId()); + if (Objects.nonNull(supplierInvoicePageQry.getOrderSupplierId())) { + queryWrapper.apply("JSON_CONTAINS(JSON_EXTRACT(si.order_supplier_invoice, '$[*].supplierId'), '" + supplierInvoicePageQry.getOrderSupplierId() + "', '$')"); + } + if (Objects.nonNull(supplierInvoicePageQry.getOrderId())) { + queryWrapper.apply("JSON_CONTAINS(JSON_EXTRACT(si.order_supplier_invoice, '$[*].orderId'), '" + supplierInvoicePageQry.getOrderId() + "', '$')"); + } + if (CollUtil.isNotEmpty(supplierInvoicePageQry.getRegistrationTime())) { + queryWrapper.between(SupplierInvoiceDO::getRegistrationTime, supplierInvoicePageQry.getRegistrationTime().get(0), supplierInvoicePageQry.getRegistrationTime().get(1)); + } queryWrapper.orderByDesc(SupplierInvoiceDO::getCreatedAt); IPage page = new Page<>(supplierInvoicePageQry.getPageIndex(), supplierInvoicePageQry.getPageSize()); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml index be0c236..bc39a35 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderSupplierMapper.xml @@ -53,8 +53,8 @@ - - + + @@ -67,7 +67,7 @@ resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderSupplierDO" resultMap="BaseResultMap"> SELECT - os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name, + os.*, si.supplier_invoice_id, si.supplier_id as invoice_supplier_id, si.supplier_name as invoice_supplier_name, si.invoice_sn, si.invoice_img, si.registration_time, po.state as po_state FROM order_supplier os @@ -79,9 +79,13 @@ LEFT JOIN `order` po ON os.order_id = po.order_id AND po.is_delete = 0 os.is_delete = 0 - - AND ov.delivery_time BETWEEN #{query.deliveryTime[0]} AND - #{query.deliveryTime[1]} + + AND ov.delivery_time BETWEEN #{query.shippingDate[0]} AND + #{query.shippingDate[1]} + + + AND si.registration_time BETWEEN #{query.invoiceDate[0]} AND + #{query.invoiceDate[1]} AND os.supplier_id = #{query.supplierId} @@ -117,7 +121,7 @@ resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderSupplierDO" resultMap="BaseResultMap"> SELECT - os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name, + os.*, si.supplier_invoice_id, si.supplier_id as invoice_supplier_id, si.supplier_name as invoice_supplier_name, si.invoice_sn, si.invoice_img, si.registration_time FROM order_supplier os LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationMapper.xml index c9e0fcf..c96c310 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationMapper.xml @@ -12,7 +12,8 @@ - + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationPaymentMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationPaymentMapper.xml index 34ee954..f9dc57d 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationPaymentMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ReconciliationPaymentMapper.xml @@ -17,8 +17,10 @@ - - + + + diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/ReconciliationPaymentCreateCmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/ReconciliationPaymentCreateCmd.java index 3d44dea..98fbda2 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/ReconciliationPaymentCreateCmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/ReconciliationPaymentCreateCmd.java @@ -1,5 +1,7 @@ package com.xunhong.erp.turbo.api.biz.dto.cmd; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountCategoryEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountTypeEnum; import com.xunhong.erp.turbo.base.dto.Command; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -7,6 +9,7 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * @author shenyifei @@ -50,13 +53,13 @@ public class ReconciliationPaymentCreateCmd extends Command { * 账户类别：1_对公账户；2_私人账户 */ @Schema(title = "账户类别：1_对公账户；2_私人账户", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean accountCategory; + private CompanyPaymentAccountCategoryEnum accountCategory; /** * 账户类型：1_银行卡；2_支付宝；3_微信 */ @Schema(title = "账户类型：1_银行卡；2_支付宝；3_微信", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean accountType; + private CompanyPaymentAccountTypeEnum accountType; /** * 银行名称 @@ -86,13 +89,19 @@ public class ReconciliationPaymentCreateCmd extends Command { * 回款时间 */ @Schema(title = "回款时间") - private LocalDateTime returnAt; + private LocalDateTime paidAt; /** * 回款金额 */ @Schema(title = "回款金额", requiredMode = Schema.RequiredMode.REQUIRED) - private BigDecimal returnAmount; + private BigDecimal paidAmount; + + /** + * 回款凭证 + */ + @Schema(title = "回款凭证") + private List paidCredentials; /** * 备注 diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java index c47a48c..20f5565 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderSupplierPageQry.java @@ -7,9 +7,8 @@ import com.xunhong.erp.turbo.base.dto.PageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.util.List; /** @@ -23,6 +22,9 @@ public class OrderSupplierPageQry extends PageQuery { @Schema(title = "订单供应商ID", type = "string") private Long orderSupplierId; + @Schema(title = "名称", type = "string") + private String name; + @Schema(title = "订单ID", type = "string") private Long orderId; @@ -30,8 +32,7 @@ public class OrderSupplierPageQry extends PageQuery { private Long supplierId; @Schema(title = "发货日期") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private List deliveryTime; + private List shippingDate; @Schema(title = "瓜农发票上传", type = "boolean") private Boolean invoiceUpload; @@ -53,5 +54,8 @@ public class OrderSupplierPageQry extends PageQuery { @Schema(title = "发票ID", type = "string") private Long invoiceId; + + @Schema(title = "发票日期") + private List invoiceDate; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationPaymentPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationPaymentPageQry.java index def31fc..56d5adf 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationPaymentPageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationPaymentPageQry.java @@ -1,5 +1,7 @@ package com.xunhong.erp.turbo.api.biz.dto.qry; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountCategoryEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountTypeEnum; import com.xunhong.erp.turbo.base.dto.PageQuery; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -15,5 +17,23 @@ public class ReconciliationPaymentPageQry extends PageQuery { @Schema(title = "对账付款ID", type = "string") private Long reconciliationPaymentId; + + @Schema(title = "经销商ID", type = "string") + private Long dealerId; + + @Schema(title = "公司ID", type = "string") + private Long companyId; + + @Schema(title = "账户类型：1_银行卡；2_支付宝；3_微信", type = "string") + private CompanyPaymentAccountTypeEnum accountType; + + @Schema(title = "账户类别：1_对公账户；2_私人账户", type = "string") + private CompanyPaymentAccountCategoryEnum accountCategory; + + @Schema(title = "开户公司名称/支付宝昵称/微信号", type = "string") + private String accountName; + + @Schema(title = "银行账号/支付宝账号/微信账号", type = "string") + private String accountNumber; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierInvoicePageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierInvoicePageQry.java index 762df59..de7f001 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierInvoicePageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/SupplierInvoicePageQry.java @@ -32,5 +32,14 @@ public class SupplierInvoicePageQry extends PageQuery { @Schema(title = "订单状态") private List poStates; + + @Schema(title = "订单供应商ID") + private Long orderSupplierId; + + @Schema(title = "订单ID") + private Long orderId; + + @Schema(title = "登记时间") + private List registrationTime; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationPaymentVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationPaymentVO.java index bf3231a..d820eab 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationPaymentVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationPaymentVO.java @@ -1,12 +1,15 @@ package com.xunhong.erp.turbo.api.biz.dto.vo; import com.alibaba.cola.dto.DTO; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountCategoryEnum; +import com.xunhong.erp.turbo.api.biz.dto.enums.CompanyPaymentAccountTypeEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * @author shenyifei @@ -50,13 +53,13 @@ public class ReconciliationPaymentVO extends DTO { * 账户类别：1_对公账户；2_私人账户 */ @Schema(title = "账户类别：1_对公账户；2_私人账户", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean accountCategory; + private CompanyPaymentAccountCategoryEnum accountCategory; /** * 账户类型：1_银行卡；2_支付宝；3_微信 */ @Schema(title = "账户类型：1_银行卡；2_支付宝；3_微信", requiredMode = Schema.RequiredMode.REQUIRED) - private Boolean accountType; + private CompanyPaymentAccountTypeEnum accountType; /** * 银行名称 @@ -86,13 +89,19 @@ public class ReconciliationPaymentVO extends DTO { * 回款时间 */ @Schema(title = "回款时间") - private LocalDateTime returnAt; + private LocalDateTime paidAt; /** * 回款金额 */ @Schema(title = "回款金额", requiredMode = Schema.RequiredMode.REQUIRED) - private BigDecimal returnAmount; + private BigDecimal paidAmount; + + /** + * 回款凭证 + */ + @Schema(title = "回款凭证") + private List paidCredentials; /** * 备注 @@ -106,5 +115,11 @@ public class ReconciliationPaymentVO extends DTO { @Schema(title = "创建时间") private LocalDateTime createdAt; + @Schema(title = "经销商") + private DealerVO dealerVO; + + @Schema(title = "公司") + private CompanyVO companyVO; + }