diff --git a/erp-turbo-business/erp-turbo-biz/pom.xml b/erp-turbo-business/erp-turbo-biz/pom.xml index c19856b..6a2d44a 100644 --- a/erp-turbo-business/erp-turbo-biz/pom.xml +++ b/erp-turbo-business/erp-turbo-biz/pom.xml @@ -1,6 +1,6 @@ - 4.0.0 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/AuditAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/AuditAssembler.java index 3eb4dca..baf09c0 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/AuditAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/AuditAssembler.java @@ -12,6 +12,6 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = {OrderAssembler.class}) public interface AuditAssembler { - @Mapping(target = "orderVO", source = "order") + @Mapping(target = "orderVO", source = "order") AuditVO toAuditVO(Audit audit); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/BoxSpecAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/BoxSpecAssembler.java index 2f44610..2a8a7f5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/BoxSpecAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/BoxSpecAssembler.java @@ -11,5 +11,5 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface BoxSpecAssembler { - BoxSpecVO toBoxSpecVO(BoxSpec boxSpec); + BoxSpecVO toBoxSpecVO(BoxSpec boxSpec); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/CostAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/CostAssembler.java index 920287d..11946f2 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/CostAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/CostAssembler.java @@ -12,6 +12,6 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface CostAssembler { - @Mapping(target = "costItemVOList", source = "costItemList") + @Mapping(target = "costItemVOList", source = "costItemList") CostVO toCostVO(Cost cost); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/DealerAccountRecordAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/DealerAccountRecordAssembler.java index bd3540c..c9ac4a1 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/DealerAccountRecordAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/DealerAccountRecordAssembler.java @@ -12,7 +12,7 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = {OrderAssembler.class}) public interface DealerAccountRecordAssembler { - @Mapping(target = "orderVO", source = "order") + @Mapping(target = "orderVO", source = "order") @Mapping(target = "orderShipVO", source = "orderShip") @Mapping(target = "dealerVO", source = "dealer") DealerAccountRecordVO toDealerAccountRecordVO(DealerAccountRecord dealerAccountRecord); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ExpenseRecordAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ExpenseRecordAssembler.java index a045e47..49b815f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ExpenseRecordAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ExpenseRecordAssembler.java @@ -11,5 +11,5 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ExpenseRecordAssembler { - ExpenseRecordVO toExpenseRecordVO(ExpenseRecord expenseRecord); + ExpenseRecordVO toExpenseRecordVO(ExpenseRecord expenseRecord); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/PaymentTaskAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/PaymentTaskAssembler.java index ded6a87..bc5c078 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/PaymentTaskAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/PaymentTaskAssembler.java @@ -12,7 +12,7 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = {OrderSupplierAssembler.class}) public interface PaymentTaskAssembler { - @Mapping(target = "supplierVO", source = "supplier") + @Mapping(target = "supplierVO", source = "supplier") @Mapping(target = "orderSupplierVOList", source = "orderSupplierList") PaymentTaskVO toPaymentTaskVO(PaymentTask paymentTask); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ProductAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ProductAssembler.java index 691c059..e4c9b48 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ProductAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ProductAssembler.java @@ -12,6 +12,6 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ProductAssembler { - @Mapping(target = "costVOList", source = "costList") + @Mapping(target = "costVOList", source = "costList") ProductVO toProductVO(Product product); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationAssembler.java index da3aa1a..d56976f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationAssembler.java @@ -12,7 +12,7 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ReconciliationAssembler { - @Mapping(target = "dealerVO", source = "dealer") + @Mapping(target = "dealerVO", source = "dealer") @Mapping(target = "companyVO", source = "company") @Mapping(target = "orderShipVOList", source = "orderShipList") ReconciliationVO toReconciliationVO(Reconciliation reconciliation); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationInvoiceAssembler.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationInvoiceAssembler.java index d76a4c4..e3fb3fe 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationInvoiceAssembler.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/assembler/ReconciliationInvoiceAssembler.java @@ -3,6 +3,7 @@ package com.xunhong.erp.turbo.biz.app.assembler; import com.xunhong.erp.turbo.api.biz.dto.vo.ReconciliationInvoiceVO; import com.xunhong.erp.turbo.biz.domain.entity.ReconciliationInvoice; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; import org.mapstruct.NullValueCheckStrategy; /** @@ -11,5 +12,8 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ReconciliationInvoiceAssembler { - ReconciliationInvoiceVO toReconciliationInvoiceVO(ReconciliationInvoice reconciliationInvoice); + @Mapping(target = "dealerVO", source = "dealer") + @Mapping(target = "dealerPaymentAccountVO", source = "dealerPaymentAccount") + @Mapping(target = "companyVO", source = "company") + ReconciliationInvoiceVO toReconciliationInvoiceVO(ReconciliationInvoice reconciliationInvoice); } 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 5e904de..d9981e4 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 @@ -11,5 +11,5 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ReconciliationPaymentAssembler { - ReconciliationPaymentVO toReconciliationPaymentVO(ReconciliationPayment reconciliationPayment); + ReconciliationPaymentVO toReconciliationPaymentVO(ReconciliationPayment reconciliationPayment); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/AuditUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/AuditUpdateCmdExe.java index c8c608f..68610ce 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/AuditUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/AuditUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class AuditUpdateCmdExe { - private final AuditAssembler auditAssembler; - private final AuditGateway auditGateway; + private final AuditAssembler auditAssembler; + private final AuditGateway auditGateway; - public AuditVO execute(AuditUpdateCmd auditUpdateCmd) { - Audit audit = auditGateway.update(auditUpdateCmd); - return auditAssembler.toAuditVO(audit); - } + public AuditVO execute(AuditUpdateCmd auditUpdateCmd) { + Audit audit = auditGateway.update(auditUpdateCmd); + return auditAssembler.toAuditVO(audit); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecCreateCmdExe.java index a173e56..3ce2a8e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class BoxSpecCreateCmdExe { - private final BoxSpecAssembler boxSpecAssembler; - private final BoxSpecGateway boxSpecGateway; + private final BoxSpecAssembler boxSpecAssembler; + private final BoxSpecGateway boxSpecGateway; - public BoxSpecVO execute(BoxSpecCreateCmd boxSpecCreateCmd) { - BoxSpec boxSpec = boxSpecGateway.save(boxSpecCreateCmd); + public BoxSpecVO execute(BoxSpecCreateCmd boxSpecCreateCmd) { + BoxSpec boxSpec = boxSpecGateway.save(boxSpecCreateCmd); - return boxSpecAssembler.toBoxSpecVO(boxSpec); - } + return boxSpecAssembler.toBoxSpecVO(boxSpec); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecDestroyCmdExe.java index 15bb0fd..2c99933 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class BoxSpecDestroyCmdExe { - private final BoxSpecGateway boxSpecGateway; + private final BoxSpecGateway boxSpecGateway; - public void execute(BoxSpecDestroyCmd boxSpecDestroyCmd) { - boxSpecGateway.destroy(boxSpecDestroyCmd); - } + public void execute(BoxSpecDestroyCmd boxSpecDestroyCmd) { + boxSpecGateway.destroy(boxSpecDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecUpdateCmdExe.java index bf7b70f..37e4462 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/BoxSpecUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class BoxSpecUpdateCmdExe { - private final BoxSpecAssembler boxSpecAssembler; - private final BoxSpecGateway boxSpecGateway; + private final BoxSpecAssembler boxSpecAssembler; + private final BoxSpecGateway boxSpecGateway; - public BoxSpecVO execute(BoxSpecUpdateCmd boxSpecUpdateCmd) { - BoxSpec boxSpec = boxSpecGateway.update(boxSpecUpdateCmd); - return boxSpecAssembler.toBoxSpecVO(boxSpec); - } + public BoxSpecVO execute(BoxSpecUpdateCmd boxSpecUpdateCmd) { + BoxSpec boxSpec = boxSpecGateway.update(boxSpecUpdateCmd); + return boxSpecAssembler.toBoxSpecVO(boxSpec); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostCreateCmdExe.java index ded891d..cd3f8b6 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class CostCreateCmdExe { - private final CostAssembler costAssembler; - private final CostGateway costGateway; + private final CostAssembler costAssembler; + private final CostGateway costGateway; - public CostVO execute(CostCreateCmd costCreateCmd) { - Cost cost = costGateway.save(costCreateCmd); + public CostVO execute(CostCreateCmd costCreateCmd) { + Cost cost = costGateway.save(costCreateCmd); - return costAssembler.toCostVO(cost); - } + return costAssembler.toCostVO(cost); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostDestroyCmdExe.java index 6885c19..8038b82 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class CostDestroyCmdExe { - private final CostGateway costGateway; + private final CostGateway costGateway; - public void execute(CostDestroyCmd costDestroyCmd) { - costGateway.destroy(costDestroyCmd); - } + public void execute(CostDestroyCmd costDestroyCmd) { + costGateway.destroy(costDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostUpdateCmdExe.java index 1a52a3a..f65eb4c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/CostUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class CostUpdateCmdExe { - private final CostAssembler costAssembler; - private final CostGateway costGateway; + private final CostAssembler costAssembler; + private final CostGateway costGateway; - public CostVO execute(CostUpdateCmd costUpdateCmd) { - Cost cost = costGateway.update(costUpdateCmd); - return costAssembler.toCostVO(cost); - } + public CostVO execute(CostUpdateCmd costUpdateCmd) { + Cost cost = costGateway.update(costUpdateCmd); + return costAssembler.toCostVO(cost); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordCreateCmdExe.java index ec3e7b8..316c56a 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class DealerAccountRecordCreateCmdExe { - private final DealerAccountRecordAssembler dealerAccountRecordAssembler; - private final DealerAccountRecordGateway dealerAccountRecordGateway; + private final DealerAccountRecordAssembler dealerAccountRecordAssembler; + private final DealerAccountRecordGateway dealerAccountRecordGateway; - public DealerAccountRecordVO execute(DealerAccountRecordCreateCmd dealerAccountRecordCreateCmd) { - DealerAccountRecord dealerAccountRecord = dealerAccountRecordGateway.save(dealerAccountRecordCreateCmd); + public DealerAccountRecordVO execute(DealerAccountRecordCreateCmd dealerAccountRecordCreateCmd) { + DealerAccountRecord dealerAccountRecord = dealerAccountRecordGateway.save(dealerAccountRecordCreateCmd); - return dealerAccountRecordAssembler.toDealerAccountRecordVO(dealerAccountRecord); - } + return dealerAccountRecordAssembler.toDealerAccountRecordVO(dealerAccountRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordDestroyCmdExe.java index cecf4e0..9063a7c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class DealerAccountRecordDestroyCmdExe { - private final DealerAccountRecordGateway dealerAccountRecordGateway; + private final DealerAccountRecordGateway dealerAccountRecordGateway; - public void execute(DealerAccountRecordDestroyCmd dealerAccountRecordDestroyCmd) { - dealerAccountRecordGateway.destroy(dealerAccountRecordDestroyCmd); - } + public void execute(DealerAccountRecordDestroyCmd dealerAccountRecordDestroyCmd) { + dealerAccountRecordGateway.destroy(dealerAccountRecordDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordUpdateCmdExe.java index 7f4fcf0..1370acf 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/DealerAccountRecordUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class DealerAccountRecordUpdateCmdExe { - private final DealerAccountRecordAssembler dealerAccountRecordAssembler; - private final DealerAccountRecordGateway dealerAccountRecordGateway; + private final DealerAccountRecordAssembler dealerAccountRecordAssembler; + private final DealerAccountRecordGateway dealerAccountRecordGateway; - public DealerAccountRecordVO execute(DealerAccountRecordUpdateCmd dealerAccountRecordUpdateCmd) { - DealerAccountRecord dealerAccountRecord = dealerAccountRecordGateway.update(dealerAccountRecordUpdateCmd); - return dealerAccountRecordAssembler.toDealerAccountRecordVO(dealerAccountRecord); - } + public DealerAccountRecordVO execute(DealerAccountRecordUpdateCmd dealerAccountRecordUpdateCmd) { + DealerAccountRecord dealerAccountRecord = dealerAccountRecordGateway.update(dealerAccountRecordUpdateCmd); + return dealerAccountRecordAssembler.toDealerAccountRecordVO(dealerAccountRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordCreateCmdExe.java index 5b334b6..81b1852 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ExpenseRecordCreateCmdExe { - private final ExpenseRecordAssembler expenseRecordAssembler; - private final ExpenseRecordGateway expenseRecordGateway; + private final ExpenseRecordAssembler expenseRecordAssembler; + private final ExpenseRecordGateway expenseRecordGateway; - public ExpenseRecordVO execute(ExpenseRecordCreateCmd expenseRecordCreateCmd) { - ExpenseRecord expenseRecord = expenseRecordGateway.save(expenseRecordCreateCmd); + public ExpenseRecordVO execute(ExpenseRecordCreateCmd expenseRecordCreateCmd) { + ExpenseRecord expenseRecord = expenseRecordGateway.save(expenseRecordCreateCmd); - return expenseRecordAssembler.toExpenseRecordVO(expenseRecord); - } + return expenseRecordAssembler.toExpenseRecordVO(expenseRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordUpdateCmdExe.java index e7018aa..918d57b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ExpenseRecordUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ExpenseRecordUpdateCmdExe { - private final ExpenseRecordAssembler expenseRecordAssembler; - private final ExpenseRecordGateway expenseRecordGateway; + private final ExpenseRecordAssembler expenseRecordAssembler; + private final ExpenseRecordGateway expenseRecordGateway; - public ExpenseRecordVO execute(ExpenseRecordUpdateCmd expenseRecordUpdateCmd) { - ExpenseRecord expenseRecord = expenseRecordGateway.update(expenseRecordUpdateCmd); - return expenseRecordAssembler.toExpenseRecordVO(expenseRecord); - } + public ExpenseRecordVO execute(ExpenseRecordUpdateCmd expenseRecordUpdateCmd) { + ExpenseRecord expenseRecord = expenseRecordGateway.update(expenseRecordUpdateCmd); + return expenseRecordAssembler.toExpenseRecordVO(expenseRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderSupplierUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderSupplierUpdateCmdExe.java index 220d317..f4060f6 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderSupplierUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderSupplierUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class OrderSupplierUpdateCmdExe { - private final OrderSupplierAssembler orderSupplierAssembler; - private final OrderSupplierGateway orderSupplierGateway; + private final OrderSupplierAssembler orderSupplierAssembler; + private final OrderSupplierGateway orderSupplierGateway; - public OrderSupplierVO execute(OrderSupplierUpdateCmd orderSupplierUpdateCmd) { - OrderSupplier orderSupplier = orderSupplierGateway.update(orderSupplierUpdateCmd); - return orderSupplierAssembler.toOrderSupplierVO(orderSupplier); - } + public OrderSupplierVO execute(OrderSupplierUpdateCmd orderSupplierUpdateCmd) { + OrderSupplier orderSupplier = orderSupplierGateway.update(orderSupplierUpdateCmd); + return orderSupplierAssembler.toOrderSupplierVO(orderSupplier); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordCreateCmdExe.java index 65340ea..138a3f5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentRecordCreateCmdExe { - private final PaymentRecordAssembler paymentRecordAssembler; - private final PaymentRecordGateway paymentRecordGateway; + private final PaymentRecordAssembler paymentRecordAssembler; + private final PaymentRecordGateway paymentRecordGateway; - public PaymentRecordVO execute(PaymentRecordCreateCmd paymentRecordCreateCmd) { - PaymentRecord paymentRecord = paymentRecordGateway.save(paymentRecordCreateCmd); + public PaymentRecordVO execute(PaymentRecordCreateCmd paymentRecordCreateCmd) { + PaymentRecord paymentRecord = paymentRecordGateway.save(paymentRecordCreateCmd); - return paymentRecordAssembler.toPaymentRecordVO(paymentRecord); - } + return paymentRecordAssembler.toPaymentRecordVO(paymentRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordDestroyCmdExe.java index df352ac..e74ba1e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class PaymentRecordDestroyCmdExe { - private final PaymentRecordGateway paymentRecordGateway; + private final PaymentRecordGateway paymentRecordGateway; - public void execute(PaymentRecordDestroyCmd paymentRecordDestroyCmd) { - paymentRecordGateway.destroy(paymentRecordDestroyCmd); - } + public void execute(PaymentRecordDestroyCmd paymentRecordDestroyCmd) { + paymentRecordGateway.destroy(paymentRecordDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordUpdateCmdExe.java index faa0877..cd1a883 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentRecordUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentRecordUpdateCmdExe { - private final PaymentRecordAssembler paymentRecordAssembler; - private final PaymentRecordGateway paymentRecordGateway; + private final PaymentRecordAssembler paymentRecordAssembler; + private final PaymentRecordGateway paymentRecordGateway; - public PaymentRecordVO execute(PaymentRecordUpdateCmd paymentRecordUpdateCmd) { - PaymentRecord paymentRecord = paymentRecordGateway.update(paymentRecordUpdateCmd); - return paymentRecordAssembler.toPaymentRecordVO(paymentRecord); - } + public PaymentRecordVO execute(PaymentRecordUpdateCmd paymentRecordUpdateCmd) { + PaymentRecord paymentRecord = paymentRecordGateway.update(paymentRecordUpdateCmd); + return paymentRecordAssembler.toPaymentRecordVO(paymentRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskCreateCmdExe.java index ab1be9f..b98d5e0 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentTaskCreateCmdExe { - private final PaymentTaskAssembler paymentTaskAssembler; - private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskAssembler paymentTaskAssembler; + private final PaymentTaskGateway paymentTaskGateway; - public PaymentTaskVO execute(PaymentTaskCreateCmd paymentTaskCreateCmd) { - PaymentTask paymentTask = paymentTaskGateway.save(paymentTaskCreateCmd); + public PaymentTaskVO execute(PaymentTaskCreateCmd paymentTaskCreateCmd) { + PaymentTask paymentTask = paymentTaskGateway.save(paymentTaskCreateCmd); - return paymentTaskAssembler.toPaymentTaskVO(paymentTask); - } + return paymentTaskAssembler.toPaymentTaskVO(paymentTask); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskDestroyCmdExe.java index 6c652ac..a74ac6c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class PaymentTaskDestroyCmdExe { - private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskGateway paymentTaskGateway; - public void execute(PaymentTaskDestroyCmd paymentTaskDestroyCmd) { - paymentTaskGateway.destroy(paymentTaskDestroyCmd); - } + public void execute(PaymentTaskDestroyCmd paymentTaskDestroyCmd) { + paymentTaskGateway.destroy(paymentTaskDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskPayCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskPayCmdExe.java index 66e6f70..81a2097 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskPayCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskPayCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentTaskPayCmdExe { - private final PaymentTaskGateway paymentTaskGateway; - private final PaymentTaskAssembler paymentTaskAssembler; + private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskAssembler paymentTaskAssembler; - public PaymentTaskVO execute(PaymentTaskPayCmd paymentTaskPayCmd) { - PaymentTask paymentTask = paymentTaskGateway.pay(paymentTaskPayCmd); - return paymentTaskAssembler.toPaymentTaskVO(paymentTask); - } + public PaymentTaskVO execute(PaymentTaskPayCmd paymentTaskPayCmd) { + PaymentTask paymentTask = paymentTaskGateway.pay(paymentTaskPayCmd); + return paymentTaskAssembler.toPaymentTaskVO(paymentTask); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskUpdateCmdExe.java index 2df48ed..551c560 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/PaymentTaskUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentTaskUpdateCmdExe { - private final PaymentTaskAssembler paymentTaskAssembler; - private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskAssembler paymentTaskAssembler; + private final PaymentTaskGateway paymentTaskGateway; - public PaymentTaskVO execute(PaymentTaskUpdateCmd paymentTaskUpdateCmd) { - PaymentTask paymentTask = paymentTaskGateway.update(paymentTaskUpdateCmd); - return paymentTaskAssembler.toPaymentTaskVO(paymentTask); - } + public PaymentTaskVO execute(PaymentTaskUpdateCmd paymentTaskUpdateCmd) { + PaymentTask paymentTask = paymentTaskGateway.update(paymentTaskUpdateCmd); + return paymentTaskAssembler.toPaymentTaskVO(paymentTask); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductCreateCmdExe.java index 17e5969..f9fd1a5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ProductCreateCmdExe { - private final ProductAssembler productAssembler; - private final ProductGateway productGateway; + private final ProductAssembler productAssembler; + private final ProductGateway productGateway; - public ProductVO execute(ProductCreateCmd productCreateCmd) { - Product product = productGateway.save(productCreateCmd); + public ProductVO execute(ProductCreateCmd productCreateCmd) { + Product product = productGateway.save(productCreateCmd); - return productAssembler.toProductVO(product); - } + return productAssembler.toProductVO(product); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductDestroyCmdExe.java index 25cf110..76dc733 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductDestroyCmdExe.java @@ -1,7 +1,6 @@ package com.xunhong.erp.turbo.biz.app.executor.cmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDestroyCmd; -import com.xunhong.erp.turbo.biz.app.assembler.ProductAssembler; import com.xunhong.erp.turbo.biz.domain.gateway.ProductGateway; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -14,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class ProductDestroyCmdExe { - private final ProductGateway productGateway; + private final ProductGateway productGateway; - public void execute(ProductDestroyCmd productDestroyCmd) { - productGateway.destroy(productDestroyCmd); - } + public void execute(ProductDestroyCmd productDestroyCmd) { + productGateway.destroy(productDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductUpdateCmdExe.java index 6a71077..5dbeaad 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ProductUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ProductUpdateCmdExe { - private final ProductAssembler productAssembler; - private final ProductGateway productGateway; + private final ProductAssembler productAssembler; + private final ProductGateway productGateway; - public ProductVO execute(ProductUpdateCmd productUpdateCmd) { - Product product = productGateway.update(productUpdateCmd); - return productAssembler.toProductVO(product); - } + public ProductVO execute(ProductUpdateCmd productUpdateCmd) { + Product product = productGateway.update(productUpdateCmd); + return productAssembler.toProductVO(product); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCompleteCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCompleteCmdExe.java index 42aace2..ed75961 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCompleteCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCompleteCmdExe.java @@ -16,11 +16,11 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class ReconciliationCompleteCmdExe { - private final ReconciliationGateway reconciliationGateway; - private final ReconciliationAssembler reconciliationAssembler; + private final ReconciliationGateway reconciliationGateway; + private final ReconciliationAssembler reconciliationAssembler; - public ReconciliationVO execute(ReconciliationCompleteCmd reconciliationCompleteCmd) { - Reconciliation reconciliation = reconciliationGateway.complete(reconciliationCompleteCmd); - return reconciliationAssembler.toReconciliationVO(reconciliation); - } + public ReconciliationVO execute(ReconciliationCompleteCmd reconciliationCompleteCmd) { + Reconciliation reconciliation = reconciliationGateway.complete(reconciliationCompleteCmd); + return reconciliationAssembler.toReconciliationVO(reconciliation); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCreateCmdExe.java index d1f0972..8c21f56 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationCreateCmdExe { - private final ReconciliationAssembler reconciliationAssembler; - private final ReconciliationGateway reconciliationGateway; + private final ReconciliationAssembler reconciliationAssembler; + private final ReconciliationGateway reconciliationGateway; - public ReconciliationVO execute(ReconciliationCreateCmd reconciliationCreateCmd) { - Reconciliation reconciliation = reconciliationGateway.save(reconciliationCreateCmd); + public ReconciliationVO execute(ReconciliationCreateCmd reconciliationCreateCmd) { + Reconciliation reconciliation = reconciliationGateway.save(reconciliationCreateCmd); - return reconciliationAssembler.toReconciliationVO(reconciliation); - } + return reconciliationAssembler.toReconciliationVO(reconciliation); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationDestroyCmdExe.java index 3fd0f68..ab980b2 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class ReconciliationDestroyCmdExe { - private final ReconciliationGateway reconciliationGateway; + private final ReconciliationGateway reconciliationGateway; - public void execute(ReconciliationDestroyCmd reconciliationDestroyCmd) { - reconciliationGateway.destroy(reconciliationDestroyCmd); - } + public void execute(ReconciliationDestroyCmd reconciliationDestroyCmd) { + reconciliationGateway.destroy(reconciliationDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceCreateCmdExe.java index ca04be9..dfba6bf 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationInvoiceCreateCmdExe { - private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; - private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; + private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; + private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; - public ReconciliationInvoiceVO execute(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd) { - ReconciliationInvoice reconciliationInvoice = reconciliationInvoiceGateway.save(reconciliationInvoiceCreateCmd); + public ReconciliationInvoiceVO execute(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd) { + ReconciliationInvoice reconciliationInvoice = reconciliationInvoiceGateway.save(reconciliationInvoiceCreateCmd); - return reconciliationInvoiceAssembler.toReconciliationInvoiceVO(reconciliationInvoice); - } + return reconciliationInvoiceAssembler.toReconciliationInvoiceVO(reconciliationInvoice); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceDestroyCmdExe.java index fcac3cc..785c0da 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class ReconciliationInvoiceDestroyCmdExe { - private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; + private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; - public void execute(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd) { - reconciliationInvoiceGateway.destroy(reconciliationInvoiceDestroyCmd); - } + public void execute(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd) { + reconciliationInvoiceGateway.destroy(reconciliationInvoiceDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceUpdateCmdExe.java index b2fcc44..b011d48 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationInvoiceUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationInvoiceUpdateCmdExe { - private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; - private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; + private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; + private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; - public ReconciliationInvoiceVO execute(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd) { - ReconciliationInvoice reconciliationInvoice = reconciliationInvoiceGateway.update(reconciliationInvoiceUpdateCmd); - return reconciliationInvoiceAssembler.toReconciliationInvoiceVO(reconciliationInvoice); - } + public ReconciliationInvoiceVO execute(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd) { + ReconciliationInvoice reconciliationInvoice = reconciliationInvoiceGateway.update(reconciliationInvoiceUpdateCmd); + return reconciliationInvoiceAssembler.toReconciliationInvoiceVO(reconciliationInvoice); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentCreateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentCreateCmdExe.java index 6638231..00b2eea 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentCreateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentCreateCmdExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationPaymentCreateCmdExe { - private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; - private final ReconciliationPaymentGateway reconciliationPaymentGateway; + private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; + private final ReconciliationPaymentGateway reconciliationPaymentGateway; - public ReconciliationPaymentVO execute(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd) { - ReconciliationPayment reconciliationPayment = reconciliationPaymentGateway.save(reconciliationPaymentCreateCmd); + public ReconciliationPaymentVO execute(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd) { + ReconciliationPayment reconciliationPayment = reconciliationPaymentGateway.save(reconciliationPaymentCreateCmd); - return reconciliationPaymentAssembler.toReconciliationPaymentVO(reconciliationPayment); - } + return reconciliationPaymentAssembler.toReconciliationPaymentVO(reconciliationPayment); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentDestroyCmdExe.java index f12c97e..b56574d 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class ReconciliationPaymentDestroyCmdExe { - private final ReconciliationPaymentGateway reconciliationPaymentGateway; + private final ReconciliationPaymentGateway reconciliationPaymentGateway; - public void execute(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd) { - reconciliationPaymentGateway.destroy(reconciliationPaymentDestroyCmd); - } + public void execute(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd) { + reconciliationPaymentGateway.destroy(reconciliationPaymentDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentUpdateCmdExe.java index 02f5a52..8620ac2 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationPaymentUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationPaymentUpdateCmdExe { - private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; - private final ReconciliationPaymentGateway reconciliationPaymentGateway; + private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; + private final ReconciliationPaymentGateway reconciliationPaymentGateway; - public ReconciliationPaymentVO execute(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd) { - ReconciliationPayment reconciliationPayment = reconciliationPaymentGateway.update(reconciliationPaymentUpdateCmd); - return reconciliationPaymentAssembler.toReconciliationPaymentVO(reconciliationPayment); - } + public ReconciliationPaymentVO execute(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd) { + ReconciliationPayment reconciliationPayment = reconciliationPaymentGateway.update(reconciliationPaymentUpdateCmd); + return reconciliationPaymentAssembler.toReconciliationPaymentVO(reconciliationPayment); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationUpdateCmdExe.java index 67cad9d..78f4217 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/ReconciliationUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationUpdateCmdExe { - private final ReconciliationAssembler reconciliationAssembler; - private final ReconciliationGateway reconciliationGateway; + private final ReconciliationAssembler reconciliationAssembler; + private final ReconciliationGateway reconciliationGateway; - public ReconciliationVO execute(ReconciliationUpdateCmd reconciliationUpdateCmd) { - Reconciliation reconciliation = reconciliationGateway.update(reconciliationUpdateCmd); - return reconciliationAssembler.toReconciliationVO(reconciliation); - } + public ReconciliationVO execute(ReconciliationUpdateCmd reconciliationUpdateCmd) { + Reconciliation reconciliation = reconciliationGateway.update(reconciliationUpdateCmd); + return reconciliationAssembler.toReconciliationVO(reconciliation); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceDestroyCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceDestroyCmdExe.java index 453c4c1..93c5c1e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceDestroyCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceDestroyCmdExe.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor public class SupplierInvoiceDestroyCmdExe { - private final SupplierInvoiceGateway supplierInvoiceGateway; + private final SupplierInvoiceGateway supplierInvoiceGateway; - public void execute(SupplierInvoiceDestroyCmd supplierInvoiceDestroyCmd) { - supplierInvoiceGateway.destroy(supplierInvoiceDestroyCmd); - } + public void execute(SupplierInvoiceDestroyCmd supplierInvoiceDestroyCmd) { + supplierInvoiceGateway.destroy(supplierInvoiceDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceUpdateCmdExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceUpdateCmdExe.java index ed5297e..7f3a29e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceUpdateCmdExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/SupplierInvoiceUpdateCmdExe.java @@ -17,11 +17,11 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class SupplierInvoiceUpdateCmdExe { - private final SupplierInvoiceAssembler supplierInvoiceAssembler; - private final SupplierInvoiceGateway supplierInvoiceGateway; + private final SupplierInvoiceAssembler supplierInvoiceAssembler; + private final SupplierInvoiceGateway supplierInvoiceGateway; - public SupplierInvoiceVO execute(SupplierInvoiceUpdateCmd invoiceUpdateCmd) { - SupplierInvoice supplierInvoice = supplierInvoiceGateway.update(invoiceUpdateCmd); - return supplierInvoiceAssembler.toInvoiceVO(supplierInvoice); - } + public SupplierInvoiceVO execute(SupplierInvoiceUpdateCmd invoiceUpdateCmd) { + SupplierInvoice supplierInvoice = supplierInvoiceGateway.update(invoiceUpdateCmd); + return supplierInvoiceAssembler.toInvoiceVO(supplierInvoice); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditPageQryExe.java index 079a7d1..11995a9 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class AuditPageQryExe { - private final AuditGateway auditGateway; - private final AuditAssembler auditAssembler; + private final AuditGateway auditGateway; + private final AuditAssembler auditAssembler; - public IPage execute(AuditPageQry auditPageQry) { - IPage page = auditGateway.page(auditPageQry); - return page.convert(auditAssembler::toAuditVO); - } + public IPage execute(AuditPageQry auditPageQry) { + IPage page = auditGateway.page(auditPageQry); + return page.convert(auditAssembler::toAuditVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditShowQryExe.java index e1e9157..9346d87 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/AuditShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class AuditShowQryExe { - private final AuditAssembler auditAssembler; - private final AuditGateway auditGateway; + private final AuditAssembler auditAssembler; + private final AuditGateway auditGateway; - public AuditVO execute(AuditShowQry auditShowQry) { - Audit audit = auditGateway.show(auditShowQry); + public AuditVO execute(AuditShowQry auditShowQry) { + Audit audit = auditGateway.show(auditShowQry); - return auditAssembler.toAuditVO(audit); - } + return auditAssembler.toAuditVO(audit); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecListQryExe.java index a4d2eb4..d987bfd 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class BoxSpecListQryExe { - private final BoxSpecGateway boxSpecGateway; - private final BoxSpecAssembler boxSpecAssembler; + private final BoxSpecGateway boxSpecGateway; + private final BoxSpecAssembler boxSpecAssembler; - public List execute(BoxSpecListQry boxSpecListQry) { - List boxSpecList = boxSpecGateway.list(boxSpecListQry); - return boxSpecList.stream().map(boxSpecAssembler::toBoxSpecVO).toList(); - } + public List execute(BoxSpecListQry boxSpecListQry) { + List boxSpecList = boxSpecGateway.list(boxSpecListQry); + return boxSpecList.stream().map(boxSpecAssembler::toBoxSpecVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecPageQryExe.java index 219ad95..d346676 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class BoxSpecPageQryExe { - private final BoxSpecGateway boxSpecGateway; - private final BoxSpecAssembler boxSpecAssembler; + private final BoxSpecGateway boxSpecGateway; + private final BoxSpecAssembler boxSpecAssembler; - public IPage execute(BoxSpecPageQry boxSpecPageQry) { - IPage page = boxSpecGateway.page(boxSpecPageQry); - return page.convert(boxSpecAssembler::toBoxSpecVO); - } + public IPage execute(BoxSpecPageQry boxSpecPageQry) { + IPage page = boxSpecGateway.page(boxSpecPageQry); + return page.convert(boxSpecAssembler::toBoxSpecVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecShowQryExe.java index 7b92aed..c8192f1 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/BoxSpecShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class BoxSpecShowQryExe { - private final BoxSpecAssembler boxSpecAssembler; - private final BoxSpecGateway boxSpecGateway; + private final BoxSpecAssembler boxSpecAssembler; + private final BoxSpecGateway boxSpecGateway; - public BoxSpecVO execute(BoxSpecShowQry boxSpecShowQry) { - BoxSpec boxSpec = boxSpecGateway.show(boxSpecShowQry); + public BoxSpecVO execute(BoxSpecShowQry boxSpecShowQry) { + BoxSpec boxSpec = boxSpecGateway.show(boxSpecShowQry); - return boxSpecAssembler.toBoxSpecVO(boxSpec); - } + return boxSpecAssembler.toBoxSpecVO(boxSpec); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostListQryExe.java index 3ca5160..e8de308 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class CostListQryExe { - private final CostGateway costGateway; - private final CostAssembler costAssembler; + private final CostGateway costGateway; + private final CostAssembler costAssembler; - public List execute(CostListQry costListQry) { - List costList = costGateway.list(costListQry); - return costList.stream().map(costAssembler::toCostVO).toList(); - } + public List execute(CostListQry costListQry) { + List costList = costGateway.list(costListQry); + return costList.stream().map(costAssembler::toCostVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostPageQryExe.java index 724bddd..a07902c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class CostPageQryExe { - private final CostGateway costGateway; - private final CostAssembler costAssembler; + private final CostGateway costGateway; + private final CostAssembler costAssembler; - public IPage execute(CostPageQry costPageQry) { - IPage page = costGateway.page(costPageQry); - return page.convert(costAssembler::toCostVO); - } + public IPage execute(CostPageQry costPageQry) { + IPage page = costGateway.page(costPageQry); + return page.convert(costAssembler::toCostVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostShowQryExe.java index 604fb42..e6f0c39 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/CostShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class CostShowQryExe { - private final CostAssembler costAssembler; - private final CostGateway costGateway; + private final CostAssembler costAssembler; + private final CostGateway costGateway; - public CostVO execute(CostShowQry costShowQry) { - Cost cost = costGateway.show(costShowQry); + public CostVO execute(CostShowQry costShowQry) { + Cost cost = costGateway.show(costShowQry); - return costAssembler.toCostVO(cost); - } + return costAssembler.toCostVO(cost); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordListQryExe.java index 5056f06..9dae083 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class DealerAccountRecordListQryExe { - private final DealerAccountRecordGateway dealerAccountRecordGateway; - private final DealerAccountRecordAssembler dealerAccountRecordAssembler; + private final DealerAccountRecordGateway dealerAccountRecordGateway; + private final DealerAccountRecordAssembler dealerAccountRecordAssembler; - public List execute(DealerAccountRecordListQry dealerAccountRecordListQry) { - List dealerAccountRecordList = dealerAccountRecordGateway.list(dealerAccountRecordListQry); - return dealerAccountRecordList.stream().map(dealerAccountRecordAssembler::toDealerAccountRecordVO).toList(); - } + public List execute(DealerAccountRecordListQry dealerAccountRecordListQry) { + List dealerAccountRecordList = dealerAccountRecordGateway.list(dealerAccountRecordListQry); + return dealerAccountRecordList.stream().map(dealerAccountRecordAssembler::toDealerAccountRecordVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordPageQryExe.java index 13fd5c7..9f92bd6 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class DealerAccountRecordPageQryExe { - private final DealerAccountRecordGateway dealerAccountRecordGateway; - private final DealerAccountRecordAssembler dealerAccountRecordAssembler; + private final DealerAccountRecordGateway dealerAccountRecordGateway; + private final DealerAccountRecordAssembler dealerAccountRecordAssembler; - public IPage execute(DealerAccountRecordPageQry dealerAccountRecordPageQry) { - IPage page = dealerAccountRecordGateway.page(dealerAccountRecordPageQry); - return page.convert(dealerAccountRecordAssembler::toDealerAccountRecordVO); - } + public IPage execute(DealerAccountRecordPageQry dealerAccountRecordPageQry) { + IPage page = dealerAccountRecordGateway.page(dealerAccountRecordPageQry); + return page.convert(dealerAccountRecordAssembler::toDealerAccountRecordVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordShowQryExe.java index 1346a85..a24913b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/DealerAccountRecordShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class DealerAccountRecordShowQryExe { - private final DealerAccountRecordAssembler dealerAccountRecordAssembler; - private final DealerAccountRecordGateway dealerAccountRecordGateway; + private final DealerAccountRecordAssembler dealerAccountRecordAssembler; + private final DealerAccountRecordGateway dealerAccountRecordGateway; - public DealerAccountRecordVO execute(DealerAccountRecordShowQry dealerAccountRecordShowQry) { - DealerAccountRecord dealerAccountRecord = dealerAccountRecordGateway.show(dealerAccountRecordShowQry); + public DealerAccountRecordVO execute(DealerAccountRecordShowQry dealerAccountRecordShowQry) { + DealerAccountRecord dealerAccountRecord = dealerAccountRecordGateway.show(dealerAccountRecordShowQry); - return dealerAccountRecordAssembler.toDealerAccountRecordVO(dealerAccountRecord); - } + return dealerAccountRecordAssembler.toDealerAccountRecordVO(dealerAccountRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordListQryExe.java index 08bd47b..5963bb9 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class ExpenseRecordListQryExe { - private final ExpenseRecordGateway expenseRecordGateway; - private final ExpenseRecordAssembler expenseRecordAssembler; + private final ExpenseRecordGateway expenseRecordGateway; + private final ExpenseRecordAssembler expenseRecordAssembler; - public List execute(ExpenseRecordListQry expenseRecordListQry) { - List expenseRecordList = expenseRecordGateway.list(expenseRecordListQry); - return expenseRecordList.stream().map(expenseRecordAssembler::toExpenseRecordVO).toList(); - } + public List execute(ExpenseRecordListQry expenseRecordListQry) { + List expenseRecordList = expenseRecordGateway.list(expenseRecordListQry); + return expenseRecordList.stream().map(expenseRecordAssembler::toExpenseRecordVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordShowQryExe.java index 1264ad5..dfb1d9e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ExpenseRecordShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ExpenseRecordShowQryExe { - private final ExpenseRecordAssembler expenseRecordAssembler; - private final ExpenseRecordGateway expenseRecordGateway; + private final ExpenseRecordAssembler expenseRecordAssembler; + private final ExpenseRecordGateway expenseRecordGateway; - public ExpenseRecordVO execute(ExpenseRecordShowQry expenseRecordShowQry) { - ExpenseRecord expenseRecord = expenseRecordGateway.show(expenseRecordShowQry); + public ExpenseRecordVO execute(ExpenseRecordShowQry expenseRecordShowQry) { + ExpenseRecord expenseRecord = expenseRecordGateway.show(expenseRecordShowQry); - return expenseRecordAssembler.toExpenseRecordVO(expenseRecord); - } + return expenseRecordAssembler.toExpenseRecordVO(expenseRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/LastVehicleNoQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/LastVehicleNoQryExe.java index 6af5650..186ad1e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/LastVehicleNoQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/LastVehicleNoQryExe.java @@ -14,9 +14,9 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class LastVehicleNoQryExe { - private final OrderGateway orderGateway; + private final OrderGateway orderGateway; - public String execute(LastVehicleNoQry lastVehicleNoQry) { - return orderGateway.getLastVehicleNo(lastVehicleNoQry); - } + public String execute(LastVehicleNoQry lastVehicleNoQry) { + return orderGateway.getLastVehicleNo(lastVehicleNoQry); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderCostPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderCostPageQryExe.java index b10b500..44d981b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderCostPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderCostPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class OrderCostPageQryExe { - private final OrderCostGateway orderCostGateway; - private final OrderCostAssembler orderCostAssembler; + private final OrderCostGateway orderCostGateway; + private final OrderCostAssembler orderCostAssembler; - public IPage execute(OrderCostPageQry orderCostPageQry) { - IPage page = orderCostGateway.page(orderCostPageQry); - return page.convert(orderCostAssembler::toOrderCostVO); - } + public IPage execute(OrderCostPageQry orderCostPageQry) { + IPage page = orderCostGateway.page(orderCostPageQry); + return page.convert(orderCostAssembler::toOrderCostVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderRebatePageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderRebatePageQryExe.java index 8123696..90255f2 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderRebatePageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderRebatePageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class OrderRebatePageQryExe { - private final OrderRebateGateway orderRebateGateway; - private final OrderRebateAssembler orderRebateAssembler; + private final OrderRebateGateway orderRebateGateway; + private final OrderRebateAssembler orderRebateAssembler; - public IPage execute(OrderRebatePageQry orderRebatePageQry) { - IPage page = orderRebateGateway.page(orderRebatePageQry); - return page.convert(orderRebateAssembler::toOrderRebateVO); - } + public IPage execute(OrderRebatePageQry orderRebatePageQry) { + IPage page = orderRebateGateway.page(orderRebatePageQry); + return page.convert(orderRebateAssembler::toOrderRebateVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderSupplierPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderSupplierPageQryExe.java index b2ed2e8..a4ea3f6 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderSupplierPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/OrderSupplierPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class OrderSupplierPageQryExe { - private final OrderSupplierGateway orderSupplierGateway; - private final OrderSupplierAssembler orderSupplierAssembler; + private final OrderSupplierGateway orderSupplierGateway; + private final OrderSupplierAssembler orderSupplierAssembler; - public IPage execute(OrderSupplierPageQry orderSupplierPageQry) { - IPage page = orderSupplierGateway.page(orderSupplierPageQry); - return page.convert(orderSupplierAssembler::toOrderSupplierVO); - } + public IPage execute(OrderSupplierPageQry orderSupplierPageQry) { + IPage page = orderSupplierGateway.page(orderSupplierPageQry); + return page.convert(orderSupplierAssembler::toOrderSupplierVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordListQryExe.java index 2deac52..3f19aed 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class PaymentRecordListQryExe { - private final PaymentRecordGateway paymentRecordGateway; - private final PaymentRecordAssembler paymentRecordAssembler; + private final PaymentRecordGateway paymentRecordGateway; + private final PaymentRecordAssembler paymentRecordAssembler; - public List execute(PaymentRecordListQry paymentRecordListQry) { - List paymentRecordList = paymentRecordGateway.list(paymentRecordListQry); - return paymentRecordList.stream().map(paymentRecordAssembler::toPaymentRecordVO).toList(); - } + public List execute(PaymentRecordListQry paymentRecordListQry) { + List paymentRecordList = paymentRecordGateway.list(paymentRecordListQry); + return paymentRecordList.stream().map(paymentRecordAssembler::toPaymentRecordVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordPageQryExe.java index 3bf9eff..f9df598 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentRecordPageQryExe { - private final PaymentRecordGateway paymentRecordGateway; - private final PaymentRecordAssembler paymentRecordAssembler; + private final PaymentRecordGateway paymentRecordGateway; + private final PaymentRecordAssembler paymentRecordAssembler; - public IPage execute(PaymentRecordPageQry paymentRecordPageQry) { - IPage page = paymentRecordGateway.page(paymentRecordPageQry); - return page.convert(paymentRecordAssembler::toPaymentRecordVO); - } + public IPage execute(PaymentRecordPageQry paymentRecordPageQry) { + IPage page = paymentRecordGateway.page(paymentRecordPageQry); + return page.convert(paymentRecordAssembler::toPaymentRecordVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordShowQryExe.java index 55c3c66..c93195f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentRecordShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentRecordShowQryExe { - private final PaymentRecordAssembler paymentRecordAssembler; - private final PaymentRecordGateway paymentRecordGateway; + private final PaymentRecordAssembler paymentRecordAssembler; + private final PaymentRecordGateway paymentRecordGateway; - public PaymentRecordVO execute(PaymentRecordShowQry paymentRecordShowQry) { - PaymentRecord paymentRecord = paymentRecordGateway.show(paymentRecordShowQry); + public PaymentRecordVO execute(PaymentRecordShowQry paymentRecordShowQry) { + PaymentRecord paymentRecord = paymentRecordGateway.show(paymentRecordShowQry); - return paymentRecordAssembler.toPaymentRecordVO(paymentRecord); - } + return paymentRecordAssembler.toPaymentRecordVO(paymentRecord); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskListQryExe.java index 29d595d..23eac05 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class PaymentTaskListQryExe { - private final PaymentTaskGateway paymentTaskGateway; - private final PaymentTaskAssembler paymentTaskAssembler; + private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskAssembler paymentTaskAssembler; - public List execute(PaymentTaskListQry paymentTaskListQry) { - List paymentTaskList = paymentTaskGateway.list(paymentTaskListQry); - return paymentTaskList.stream().map(paymentTaskAssembler::toPaymentTaskVO).toList(); - } + public List execute(PaymentTaskListQry paymentTaskListQry) { + List paymentTaskList = paymentTaskGateway.list(paymentTaskListQry); + return paymentTaskList.stream().map(paymentTaskAssembler::toPaymentTaskVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskPageQryExe.java index f54c7f7..58b57fd 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentTaskPageQryExe { - private final PaymentTaskGateway paymentTaskGateway; - private final PaymentTaskAssembler paymentTaskAssembler; + private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskAssembler paymentTaskAssembler; - public IPage execute(PaymentTaskPageQry paymentTaskPageQry) { - IPage page = paymentTaskGateway.page(paymentTaskPageQry); - return page.convert(paymentTaskAssembler::toPaymentTaskVO); - } + public IPage execute(PaymentTaskPageQry paymentTaskPageQry) { + IPage page = paymentTaskGateway.page(paymentTaskPageQry); + return page.convert(paymentTaskAssembler::toPaymentTaskVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskShowQryExe.java index 86005dc..568baf4 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentTaskShowQryExe { - private final PaymentTaskAssembler paymentTaskAssembler; - private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskAssembler paymentTaskAssembler; + private final PaymentTaskGateway paymentTaskGateway; - public PaymentTaskVO execute(PaymentTaskShowQry paymentTaskShowQry) { - PaymentTask paymentTask = paymentTaskGateway.show(paymentTaskShowQry); + public PaymentTaskVO execute(PaymentTaskShowQry paymentTaskShowQry) { + PaymentTask paymentTask = paymentTaskGateway.show(paymentTaskShowQry); - return paymentTaskAssembler.toPaymentTaskVO(paymentTask); - } + return paymentTaskAssembler.toPaymentTaskVO(paymentTask); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskStatisticsQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskStatisticsQryExe.java index f311c87..bdbebfc 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskStatisticsQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/PaymentTaskStatisticsQryExe.java @@ -15,9 +15,9 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class PaymentTaskStatisticsQryExe { - private final PaymentTaskGateway paymentTaskGateway; + private final PaymentTaskGateway paymentTaskGateway; - public PaymentTaskStatisticsVO execute(PaymentTaskStatisticsQry statisticsQry) { - return paymentTaskGateway.statistics(statisticsQry); - } + public PaymentTaskStatisticsVO execute(PaymentTaskStatisticsQry statisticsQry) { + return paymentTaskGateway.statistics(statisticsQry); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductListQryExe.java index c14b8c1..8a71dd4 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class ProductListQryExe { - private final ProductGateway productGateway; - private final ProductAssembler productAssembler; + private final ProductGateway productGateway; + private final ProductAssembler productAssembler; - public List execute(ProductListQry productListQry) { - List productList = productGateway.list(productListQry); - return productList.stream().map(productAssembler::toProductVO).toList(); - } + public List execute(ProductListQry productListQry) { + List productList = productGateway.list(productListQry); + return productList.stream().map(productAssembler::toProductVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductPageQryExe.java index 485747c..20fdee1 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ProductPageQryExe { - private final ProductGateway productGateway; - private final ProductAssembler productAssembler; + private final ProductGateway productGateway; + private final ProductAssembler productAssembler; - public IPage execute(ProductPageQry productPageQry) { - IPage page = productGateway.page(productPageQry); - return page.convert(productAssembler::toProductVO); - } + public IPage execute(ProductPageQry productPageQry) { + IPage page = productGateway.page(productPageQry); + return page.convert(productAssembler::toProductVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductShowQryExe.java index 2e16e21..e186e34 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ProductShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ProductShowQryExe { - private final ProductAssembler productAssembler; - private final ProductGateway productGateway; + private final ProductAssembler productAssembler; + private final ProductGateway productGateway; - public ProductVO execute(ProductShowQry productShowQry) { - Product product = productGateway.show(productShowQry); + public ProductVO execute(ProductShowQry productShowQry) { + Product product = productGateway.show(productShowQry); - return productAssembler.toProductVO(product); - } + return productAssembler.toProductVO(product); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceListQryExe.java index adb0cad..ad766c0 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class ReconciliationInvoiceListQryExe { - private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; - private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; + private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; + private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; - public List execute(ReconciliationInvoiceListQry reconciliationInvoiceListQry) { - List reconciliationInvoiceList = reconciliationInvoiceGateway.list(reconciliationInvoiceListQry); - return reconciliationInvoiceList.stream().map(reconciliationInvoiceAssembler::toReconciliationInvoiceVO).toList(); - } + public List execute(ReconciliationInvoiceListQry reconciliationInvoiceListQry) { + List reconciliationInvoiceList = reconciliationInvoiceGateway.list(reconciliationInvoiceListQry); + return reconciliationInvoiceList.stream().map(reconciliationInvoiceAssembler::toReconciliationInvoiceVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoicePageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoicePageQryExe.java index c3b487c..a8439ba 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoicePageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoicePageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationInvoicePageQryExe { - private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; - private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; + private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; + private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; - public IPage execute(ReconciliationInvoicePageQry reconciliationInvoicePageQry) { - IPage page = reconciliationInvoiceGateway.page(reconciliationInvoicePageQry); - return page.convert(reconciliationInvoiceAssembler::toReconciliationInvoiceVO); - } + public IPage execute(ReconciliationInvoicePageQry reconciliationInvoicePageQry) { + IPage page = reconciliationInvoiceGateway.page(reconciliationInvoicePageQry); + return page.convert(reconciliationInvoiceAssembler::toReconciliationInvoiceVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceShowQryExe.java index 0f76d18..5cd22c3 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationInvoiceShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationInvoiceShowQryExe { - private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; - private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; + private final ReconciliationInvoiceAssembler reconciliationInvoiceAssembler; + private final ReconciliationInvoiceGateway reconciliationInvoiceGateway; - public ReconciliationInvoiceVO execute(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry) { - ReconciliationInvoice reconciliationInvoice = reconciliationInvoiceGateway.show(reconciliationInvoiceShowQry); + public ReconciliationInvoiceVO execute(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry) { + ReconciliationInvoice reconciliationInvoice = reconciliationInvoiceGateway.show(reconciliationInvoiceShowQry); - return reconciliationInvoiceAssembler.toReconciliationInvoiceVO(reconciliationInvoice); - } + return reconciliationInvoiceAssembler.toReconciliationInvoiceVO(reconciliationInvoice); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationListQryExe.java index 0b73ed3..a147b0c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class ReconciliationListQryExe { - private final ReconciliationGateway reconciliationGateway; - private final ReconciliationAssembler reconciliationAssembler; + private final ReconciliationGateway reconciliationGateway; + private final ReconciliationAssembler reconciliationAssembler; - public List execute(ReconciliationListQry reconciliationListQry) { - List reconciliationList = reconciliationGateway.list(reconciliationListQry); - return reconciliationList.stream().map(reconciliationAssembler::toReconciliationVO).toList(); - } + public List execute(ReconciliationListQry reconciliationListQry) { + List reconciliationList = reconciliationGateway.list(reconciliationListQry); + return reconciliationList.stream().map(reconciliationAssembler::toReconciliationVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPageQryExe.java index cb468d8..03e04fc 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationPageQryExe { - private final ReconciliationGateway reconciliationGateway; - private final ReconciliationAssembler reconciliationAssembler; + private final ReconciliationGateway reconciliationGateway; + private final ReconciliationAssembler reconciliationAssembler; - public IPage execute(ReconciliationPageQry reconciliationPageQry) { - IPage page = reconciliationGateway.page(reconciliationPageQry); - return page.convert(reconciliationAssembler::toReconciliationVO); - } + public IPage execute(ReconciliationPageQry reconciliationPageQry) { + IPage page = reconciliationGateway.page(reconciliationPageQry); + return page.convert(reconciliationAssembler::toReconciliationVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentListQryExe.java index e1aee91..4541546 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class ReconciliationPaymentListQryExe { - private final ReconciliationPaymentGateway reconciliationPaymentGateway; - private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; + private final ReconciliationPaymentGateway reconciliationPaymentGateway; + private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; - public List execute(ReconciliationPaymentListQry reconciliationPaymentListQry) { - List reconciliationPaymentList = reconciliationPaymentGateway.list(reconciliationPaymentListQry); - return reconciliationPaymentList.stream().map(reconciliationPaymentAssembler::toReconciliationPaymentVO).toList(); - } + public List execute(ReconciliationPaymentListQry reconciliationPaymentListQry) { + List reconciliationPaymentList = reconciliationPaymentGateway.list(reconciliationPaymentListQry); + return reconciliationPaymentList.stream().map(reconciliationPaymentAssembler::toReconciliationPaymentVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentPageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentPageQryExe.java index 5217ee0..1219875 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentPageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentPageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationPaymentPageQryExe { - private final ReconciliationPaymentGateway reconciliationPaymentGateway; - private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; + private final ReconciliationPaymentGateway reconciliationPaymentGateway; + private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; - public IPage execute(ReconciliationPaymentPageQry reconciliationPaymentPageQry) { - IPage page = reconciliationPaymentGateway.page(reconciliationPaymentPageQry); - return page.convert(reconciliationPaymentAssembler::toReconciliationPaymentVO); - } + public IPage execute(ReconciliationPaymentPageQry reconciliationPaymentPageQry) { + IPage page = reconciliationPaymentGateway.page(reconciliationPaymentPageQry); + return page.convert(reconciliationPaymentAssembler::toReconciliationPaymentVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentShowQryExe.java index 42f26e3..2826896 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationPaymentShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationPaymentShowQryExe { - private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; - private final ReconciliationPaymentGateway reconciliationPaymentGateway; + private final ReconciliationPaymentAssembler reconciliationPaymentAssembler; + private final ReconciliationPaymentGateway reconciliationPaymentGateway; - public ReconciliationPaymentVO execute(ReconciliationPaymentShowQry reconciliationPaymentShowQry) { - ReconciliationPayment reconciliationPayment = reconciliationPaymentGateway.show(reconciliationPaymentShowQry); + public ReconciliationPaymentVO execute(ReconciliationPaymentShowQry reconciliationPaymentShowQry) { + ReconciliationPayment reconciliationPayment = reconciliationPaymentGateway.show(reconciliationPaymentShowQry); - return reconciliationPaymentAssembler.toReconciliationPaymentVO(reconciliationPayment); - } + return reconciliationPaymentAssembler.toReconciliationPaymentVO(reconciliationPayment); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationShowQryExe.java index a20fed2..5cfcf9d 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/ReconciliationShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class ReconciliationShowQryExe { - private final ReconciliationAssembler reconciliationAssembler; - private final ReconciliationGateway reconciliationGateway; + private final ReconciliationAssembler reconciliationAssembler; + private final ReconciliationGateway reconciliationGateway; - public ReconciliationVO execute(ReconciliationShowQry reconciliationShowQry) { - Reconciliation reconciliation = reconciliationGateway.show(reconciliationShowQry); + public ReconciliationVO execute(ReconciliationShowQry reconciliationShowQry) { + Reconciliation reconciliation = reconciliationGateway.show(reconciliationShowQry); - return reconciliationAssembler.toReconciliationVO(reconciliation); - } + return reconciliationAssembler.toReconciliationVO(reconciliation); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceListQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceListQryExe.java index dee9c67..3441b79 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceListQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceListQryExe.java @@ -19,12 +19,12 @@ import java.util.List; @RequiredArgsConstructor public class SupplierInvoiceListQryExe { - private final SupplierInvoiceGateway supplierInvoiceGateway; - private final SupplierInvoiceAssembler supplierInvoiceAssembler; + private final SupplierInvoiceGateway supplierInvoiceGateway; + private final SupplierInvoiceAssembler supplierInvoiceAssembler; - public List execute(SupplierInvoiceListQry supplierInvoiceListQry) { - List supplierInvoiceList = supplierInvoiceGateway.list(supplierInvoiceListQry); - return supplierInvoiceList.stream().map(supplierInvoiceAssembler::toInvoiceVO).toList(); - } + public List execute(SupplierInvoiceListQry supplierInvoiceListQry) { + List supplierInvoiceList = supplierInvoiceGateway.list(supplierInvoiceListQry); + return supplierInvoiceList.stream().map(supplierInvoiceAssembler::toInvoiceVO).toList(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoicePageQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoicePageQryExe.java index 73f5628..a57dc62 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoicePageQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoicePageQryExe.java @@ -18,12 +18,12 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class SupplierInvoicePageQryExe { - private final SupplierInvoiceGateway supplierInvoiceGateway; - private final SupplierInvoiceAssembler supplierInvoiceAssembler; + private final SupplierInvoiceGateway supplierInvoiceGateway; + private final SupplierInvoiceAssembler supplierInvoiceAssembler; - public IPage execute(SupplierInvoicePageQry supplierInvoicePageQry) { - IPage page = supplierInvoiceGateway.page(supplierInvoicePageQry); - return page.convert(supplierInvoiceAssembler::toInvoiceVO); - } + public IPage execute(SupplierInvoicePageQry supplierInvoicePageQry) { + IPage page = supplierInvoiceGateway.page(supplierInvoicePageQry); + return page.convert(supplierInvoiceAssembler::toInvoiceVO); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceShowQryExe.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceShowQryExe.java index a5118ee..34c1159 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceShowQryExe.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/query/SupplierInvoiceShowQryExe.java @@ -17,13 +17,13 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class SupplierInvoiceShowQryExe { - private final SupplierInvoiceAssembler supplierInvoiceAssembler; - private final SupplierInvoiceGateway supplierInvoiceGateway; + private final SupplierInvoiceAssembler supplierInvoiceAssembler; + private final SupplierInvoiceGateway supplierInvoiceGateway; - public SupplierInvoiceVO execute(SupplierInvoiceShowQry supplierInvoiceShowQry) { - SupplierInvoice supplierInvoice = supplierInvoiceGateway.show(supplierInvoiceShowQry); + public SupplierInvoiceVO execute(SupplierInvoiceShowQry supplierInvoiceShowQry) { + SupplierInvoice supplierInvoice = supplierInvoiceGateway.show(supplierInvoiceShowQry); - return supplierInvoiceAssembler.toInvoiceVO(supplierInvoice); - } + return supplierInvoiceAssembler.toInvoiceVO(supplierInvoice); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/AuditServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/AuditServiceImpl.java index 94901e1..b2a44d0 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/AuditServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/AuditServiceImpl.java @@ -23,23 +23,23 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class AuditServiceImpl implements AuditServiceI { - private final AuditUpdateCmdExe auditUpdateCmdExe; - private final AuditPageQryExe auditPageQryExe; - private final AuditShowQryExe auditShowQryExe; + private final AuditUpdateCmdExe auditUpdateCmdExe; + private final AuditPageQryExe auditPageQryExe; + private final AuditShowQryExe auditShowQryExe; - @Override - public PageDTO page(AuditPageQry auditPageQry) { - return PageDTO.of(auditPageQryExe.execute(auditPageQry)); - } + @Override + public PageDTO page(AuditPageQry auditPageQry) { + return PageDTO.of(auditPageQryExe.execute(auditPageQry)); + } - @Override - public AuditVO update(AuditUpdateCmd auditUpdateCmd) { - return auditUpdateCmdExe.execute(auditUpdateCmd); - } + @Override + public AuditVO update(AuditUpdateCmd auditUpdateCmd) { + return auditUpdateCmdExe.execute(auditUpdateCmd); + } - @Override - public AuditVO show(AuditShowQry auditShowQry) { - return auditShowQryExe.execute(auditShowQry); - } + @Override + public AuditVO show(AuditShowQry auditShowQry) { + return auditShowQryExe.execute(auditShowQry); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/BoxSpecServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/BoxSpecServiceImpl.java index a855976..c357748 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/BoxSpecServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/BoxSpecServiceImpl.java @@ -31,41 +31,41 @@ import java.util.List; @RequiredArgsConstructor public class BoxSpecServiceImpl implements BoxSpecServiceI { - private final BoxSpecCreateCmdExe boxSpecCreateCmdExe; - private final BoxSpecUpdateCmdExe boxSpecUpdateCmdExe; - private final BoxSpecPageQryExe boxSpecPageQryExe; - private final BoxSpecListQryExe boxSpecListQryExe; - private final BoxSpecShowQryExe boxSpecShowQryExe; - private final BoxSpecDestroyCmdExe boxSpecDestroyCmdExe; + private final BoxSpecCreateCmdExe boxSpecCreateCmdExe; + private final BoxSpecUpdateCmdExe boxSpecUpdateCmdExe; + private final BoxSpecPageQryExe boxSpecPageQryExe; + private final BoxSpecListQryExe boxSpecListQryExe; + private final BoxSpecShowQryExe boxSpecShowQryExe; + private final BoxSpecDestroyCmdExe boxSpecDestroyCmdExe; - @Override - public BoxSpecVO create(BoxSpecCreateCmd boxSpecCreateCmd) { - return boxSpecCreateCmdExe.execute(boxSpecCreateCmd); - } + @Override + public BoxSpecVO create(BoxSpecCreateCmd boxSpecCreateCmd) { + return boxSpecCreateCmdExe.execute(boxSpecCreateCmd); + } - @Override - public PageDTO page(BoxSpecPageQry boxSpecPageQry) { - return PageDTO.of(boxSpecPageQryExe.execute(boxSpecPageQry)); - } + @Override + public PageDTO page(BoxSpecPageQry boxSpecPageQry) { + return PageDTO.of(boxSpecPageQryExe.execute(boxSpecPageQry)); + } - @Override - public List list(BoxSpecListQry boxSpecListQry) { - return boxSpecListQryExe.execute(boxSpecListQry); - } + @Override + public List list(BoxSpecListQry boxSpecListQry) { + return boxSpecListQryExe.execute(boxSpecListQry); + } - @Override - public BoxSpecVO update(BoxSpecUpdateCmd boxSpecUpdateCmd) { - return boxSpecUpdateCmdExe.execute(boxSpecUpdateCmd); - } + @Override + public BoxSpecVO update(BoxSpecUpdateCmd boxSpecUpdateCmd) { + return boxSpecUpdateCmdExe.execute(boxSpecUpdateCmd); + } - @Override - public BoxSpecVO show(BoxSpecShowQry boxSpecShowQry) { - return boxSpecShowQryExe.execute(boxSpecShowQry); - } + @Override + public BoxSpecVO show(BoxSpecShowQry boxSpecShowQry) { + return boxSpecShowQryExe.execute(boxSpecShowQry); + } - @Override - public void destroy(BoxSpecDestroyCmd boxSpecDestroyCmd) { - boxSpecDestroyCmdExe.execute(boxSpecDestroyCmd); - } + @Override + public void destroy(BoxSpecDestroyCmd boxSpecDestroyCmd) { + boxSpecDestroyCmdExe.execute(boxSpecDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostServiceImpl.java index b2c4c01..619c682 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/CostServiceImpl.java @@ -33,43 +33,43 @@ import java.util.List; @RequiredArgsConstructor public class CostServiceImpl implements CostServiceI { - private final CostCreateCmdExe costCreateCmdExe; - private final CostUpdateCmdExe costUpdateCmdExe; - private final CostPageQryExe costPageQryExe; - private final CostListQryExe costListQryExe; - private final CostShowQryExe costShowQryExe; - private final CostDestroyCmdExe costDestroyCmdExe; + private final CostCreateCmdExe costCreateCmdExe; + private final CostUpdateCmdExe costUpdateCmdExe; + private final CostPageQryExe costPageQryExe; + private final CostListQryExe costListQryExe; + private final CostShowQryExe costShowQryExe; + private final CostDestroyCmdExe costDestroyCmdExe; private final CostDragCmdExe costDragCmdExe; - @Override - public CostVO create(CostCreateCmd costCreateCmd) { - return costCreateCmdExe.execute(costCreateCmd); - } + @Override + public CostVO create(CostCreateCmd costCreateCmd) { + return costCreateCmdExe.execute(costCreateCmd); + } - @Override - public PageDTO page(CostPageQry costPageQry) { - return PageDTO.of(costPageQryExe.execute(costPageQry)); - } + @Override + public PageDTO page(CostPageQry costPageQry) { + return PageDTO.of(costPageQryExe.execute(costPageQry)); + } - @Override - public List list(CostListQry costListQry) { - return costListQryExe.execute(costListQry); - } + @Override + public List list(CostListQry costListQry) { + return costListQryExe.execute(costListQry); + } - @Override - public CostVO update(CostUpdateCmd costUpdateCmd) { - return costUpdateCmdExe.execute(costUpdateCmd); - } + @Override + public CostVO update(CostUpdateCmd costUpdateCmd) { + return costUpdateCmdExe.execute(costUpdateCmd); + } - @Override - public CostVO show(CostShowQry costShowQry) { - return costShowQryExe.execute(costShowQry); - } + @Override + public CostVO show(CostShowQry costShowQry) { + return costShowQryExe.execute(costShowQry); + } - @Override - public void destroy(CostDestroyCmd costDestroyCmd) { - costDestroyCmdExe.execute(costDestroyCmd); - } + @Override + public void destroy(CostDestroyCmd costDestroyCmd) { + costDestroyCmdExe.execute(costDestroyCmd); + } @Override public void drag(CostDragCmd costDragCmd) { diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/DealerAccountRecordServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/DealerAccountRecordServiceImpl.java index 1d9261b..bba48a4 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/DealerAccountRecordServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/DealerAccountRecordServiceImpl.java @@ -31,41 +31,41 @@ import java.util.List; @RequiredArgsConstructor public class DealerAccountRecordServiceImpl implements DealerAccountRecordServiceI { - private final DealerAccountRecordCreateCmdExe dealerAccountRecordCreateCmdExe; - private final DealerAccountRecordUpdateCmdExe dealerAccountRecordUpdateCmdExe; - private final DealerAccountRecordPageQryExe dealerAccountRecordPageQryExe; - private final DealerAccountRecordListQryExe dealerAccountRecordListQryExe; - private final DealerAccountRecordShowQryExe dealerAccountRecordShowQryExe; - private final DealerAccountRecordDestroyCmdExe dealerAccountRecordDestroyCmdExe; + private final DealerAccountRecordCreateCmdExe dealerAccountRecordCreateCmdExe; + private final DealerAccountRecordUpdateCmdExe dealerAccountRecordUpdateCmdExe; + private final DealerAccountRecordPageQryExe dealerAccountRecordPageQryExe; + private final DealerAccountRecordListQryExe dealerAccountRecordListQryExe; + private final DealerAccountRecordShowQryExe dealerAccountRecordShowQryExe; + private final DealerAccountRecordDestroyCmdExe dealerAccountRecordDestroyCmdExe; - @Override - public DealerAccountRecordVO create(DealerAccountRecordCreateCmd dealerAccountRecordCreateCmd) { - return dealerAccountRecordCreateCmdExe.execute(dealerAccountRecordCreateCmd); - } + @Override + public DealerAccountRecordVO create(DealerAccountRecordCreateCmd dealerAccountRecordCreateCmd) { + return dealerAccountRecordCreateCmdExe.execute(dealerAccountRecordCreateCmd); + } - @Override - public PageDTO page(DealerAccountRecordPageQry dealerAccountRecordPageQry) { - return PageDTO.of(dealerAccountRecordPageQryExe.execute(dealerAccountRecordPageQry)); - } + @Override + public PageDTO page(DealerAccountRecordPageQry dealerAccountRecordPageQry) { + return PageDTO.of(dealerAccountRecordPageQryExe.execute(dealerAccountRecordPageQry)); + } - @Override - public List list(DealerAccountRecordListQry dealerAccountRecordListQry) { - return dealerAccountRecordListQryExe.execute(dealerAccountRecordListQry); - } + @Override + public List list(DealerAccountRecordListQry dealerAccountRecordListQry) { + return dealerAccountRecordListQryExe.execute(dealerAccountRecordListQry); + } - @Override - public DealerAccountRecordVO update(DealerAccountRecordUpdateCmd dealerAccountRecordUpdateCmd) { - return dealerAccountRecordUpdateCmdExe.execute(dealerAccountRecordUpdateCmd); - } + @Override + public DealerAccountRecordVO update(DealerAccountRecordUpdateCmd dealerAccountRecordUpdateCmd) { + return dealerAccountRecordUpdateCmdExe.execute(dealerAccountRecordUpdateCmd); + } - @Override - public DealerAccountRecordVO show(DealerAccountRecordShowQry dealerAccountRecordShowQry) { - return dealerAccountRecordShowQryExe.execute(dealerAccountRecordShowQry); - } + @Override + public DealerAccountRecordVO show(DealerAccountRecordShowQry dealerAccountRecordShowQry) { + return dealerAccountRecordShowQryExe.execute(dealerAccountRecordShowQry); + } - @Override - public void destroy(DealerAccountRecordDestroyCmd dealerAccountRecordDestroyCmd) { - dealerAccountRecordDestroyCmdExe.execute(dealerAccountRecordDestroyCmd); - } + @Override + public void destroy(DealerAccountRecordDestroyCmd dealerAccountRecordDestroyCmd) { + dealerAccountRecordDestroyCmdExe.execute(dealerAccountRecordDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ExpenseRecordServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ExpenseRecordServiceImpl.java index 99ead84..86f55cb 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ExpenseRecordServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ExpenseRecordServiceImpl.java @@ -26,29 +26,29 @@ import java.util.List; @RequiredArgsConstructor public class ExpenseRecordServiceImpl implements ExpenseRecordServiceI { - private final ExpenseRecordCreateCmdExe expenseRecordCreateCmdExe; - private final ExpenseRecordUpdateCmdExe expenseRecordUpdateCmdExe; - private final ExpenseRecordListQryExe expenseRecordListQryExe; - private final ExpenseRecordShowQryExe expenseRecordShowQryExe; + private final ExpenseRecordCreateCmdExe expenseRecordCreateCmdExe; + private final ExpenseRecordUpdateCmdExe expenseRecordUpdateCmdExe; + private final ExpenseRecordListQryExe expenseRecordListQryExe; + private final ExpenseRecordShowQryExe expenseRecordShowQryExe; - @Override - public ExpenseRecordVO create(ExpenseRecordCreateCmd expenseRecordCreateCmd) { - return expenseRecordCreateCmdExe.execute(expenseRecordCreateCmd); - } + @Override + public ExpenseRecordVO create(ExpenseRecordCreateCmd expenseRecordCreateCmd) { + return expenseRecordCreateCmdExe.execute(expenseRecordCreateCmd); + } - @Override - public List list(ExpenseRecordListQry expenseRecordListQry) { - return expenseRecordListQryExe.execute(expenseRecordListQry); - } + @Override + public List list(ExpenseRecordListQry expenseRecordListQry) { + return expenseRecordListQryExe.execute(expenseRecordListQry); + } - @Override - public ExpenseRecordVO update(ExpenseRecordUpdateCmd expenseRecordUpdateCmd) { - return expenseRecordUpdateCmdExe.execute(expenseRecordUpdateCmd); - } + @Override + public ExpenseRecordVO update(ExpenseRecordUpdateCmd expenseRecordUpdateCmd) { + return expenseRecordUpdateCmdExe.execute(expenseRecordUpdateCmd); + } - @Override - public ExpenseRecordVO show(ExpenseRecordShowQry expenseRecordShowQry) { - return expenseRecordShowQryExe.execute(expenseRecordShowQry); - } + @Override + public ExpenseRecordVO show(ExpenseRecordShowQry expenseRecordShowQry) { + return expenseRecordShowQryExe.execute(expenseRecordShowQry); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/OrderSupplierServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/OrderSupplierServiceImpl.java index f7ecdb2..975ad5e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/OrderSupplierServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/OrderSupplierServiceImpl.java @@ -21,19 +21,19 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class OrderSupplierServiceImpl implements OrderSupplierServiceI { - private final OrderSupplierUpdateCmdExe orderSupplierUpdateCmdExe; - private final OrderSupplierPageQryExe orderSupplierPageQryExe; + private final OrderSupplierUpdateCmdExe orderSupplierUpdateCmdExe; + private final OrderSupplierPageQryExe orderSupplierPageQryExe; - @Override - public PageDTO page(OrderSupplierPageQry orderSupplierPageQry) { - return PageDTO.of(orderSupplierPageQryExe.execute(orderSupplierPageQry)); - } + @Override + public PageDTO page(OrderSupplierPageQry orderSupplierPageQry) { + return PageDTO.of(orderSupplierPageQryExe.execute(orderSupplierPageQry)); + } - @Override - public OrderSupplierVO update(OrderSupplierUpdateCmd orderSupplierUpdateCmd) { - return orderSupplierUpdateCmdExe.execute(orderSupplierUpdateCmd); - } + @Override + public OrderSupplierVO update(OrderSupplierUpdateCmd orderSupplierUpdateCmd) { + return orderSupplierUpdateCmdExe.execute(orderSupplierUpdateCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentRecordServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentRecordServiceImpl.java index 4542099..e7025eb 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentRecordServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentRecordServiceImpl.java @@ -31,41 +31,41 @@ import java.util.List; @RequiredArgsConstructor public class PaymentRecordServiceImpl implements PaymentRecordServiceI { - private final PaymentRecordCreateCmdExe paymentRecordCreateCmdExe; - private final PaymentRecordUpdateCmdExe paymentRecordUpdateCmdExe; - private final PaymentRecordPageQryExe paymentRecordPageQryExe; - private final PaymentRecordListQryExe paymentRecordListQryExe; - private final PaymentRecordShowQryExe paymentRecordShowQryExe; - private final PaymentRecordDestroyCmdExe paymentRecordDestroyCmdExe; + private final PaymentRecordCreateCmdExe paymentRecordCreateCmdExe; + private final PaymentRecordUpdateCmdExe paymentRecordUpdateCmdExe; + private final PaymentRecordPageQryExe paymentRecordPageQryExe; + private final PaymentRecordListQryExe paymentRecordListQryExe; + private final PaymentRecordShowQryExe paymentRecordShowQryExe; + private final PaymentRecordDestroyCmdExe paymentRecordDestroyCmdExe; - @Override - public PaymentRecordVO create(PaymentRecordCreateCmd paymentRecordCreateCmd) { - return paymentRecordCreateCmdExe.execute(paymentRecordCreateCmd); - } + @Override + public PaymentRecordVO create(PaymentRecordCreateCmd paymentRecordCreateCmd) { + return paymentRecordCreateCmdExe.execute(paymentRecordCreateCmd); + } - @Override - public PageDTO page(PaymentRecordPageQry paymentRecordPageQry) { - return PageDTO.of(paymentRecordPageQryExe.execute(paymentRecordPageQry)); - } + @Override + public PageDTO page(PaymentRecordPageQry paymentRecordPageQry) { + return PageDTO.of(paymentRecordPageQryExe.execute(paymentRecordPageQry)); + } - @Override - public List list(PaymentRecordListQry paymentRecordListQry) { - return paymentRecordListQryExe.execute(paymentRecordListQry); - } + @Override + public List list(PaymentRecordListQry paymentRecordListQry) { + return paymentRecordListQryExe.execute(paymentRecordListQry); + } - @Override - public PaymentRecordVO update(PaymentRecordUpdateCmd paymentRecordUpdateCmd) { - return paymentRecordUpdateCmdExe.execute(paymentRecordUpdateCmd); - } + @Override + public PaymentRecordVO update(PaymentRecordUpdateCmd paymentRecordUpdateCmd) { + return paymentRecordUpdateCmdExe.execute(paymentRecordUpdateCmd); + } - @Override - public PaymentRecordVO show(PaymentRecordShowQry paymentRecordShowQry) { - return paymentRecordShowQryExe.execute(paymentRecordShowQry); - } + @Override + public PaymentRecordVO show(PaymentRecordShowQry paymentRecordShowQry) { + return paymentRecordShowQryExe.execute(paymentRecordShowQry); + } - @Override - public void destroy(PaymentRecordDestroyCmd paymentRecordDestroyCmd) { - paymentRecordDestroyCmdExe.execute(paymentRecordDestroyCmd); - } + @Override + public void destroy(PaymentRecordDestroyCmd paymentRecordDestroyCmd) { + paymentRecordDestroyCmdExe.execute(paymentRecordDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentTaskServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentTaskServiceImpl.java index b5efc2e..76fd328 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentTaskServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/PaymentTaskServiceImpl.java @@ -36,53 +36,53 @@ import java.util.List; @RequiredArgsConstructor public class PaymentTaskServiceImpl implements PaymentTaskServiceI { - private final PaymentTaskCreateCmdExe paymentTaskCreateCmdExe; - private final PaymentTaskUpdateCmdExe paymentTaskUpdateCmdExe; - private final PaymentTaskPageQryExe paymentTaskPageQryExe; - private final PaymentTaskListQryExe paymentTaskListQryExe; - private final PaymentTaskShowQryExe paymentTaskShowQryExe; - private final PaymentTaskDestroyCmdExe paymentTaskDestroyCmdExe; - private final PaymentTaskStatisticsQryExe paymentTaskStatisticsQryExe; - private final PaymentTaskPayCmdExe paymentTaskPayCmdExe; + private final PaymentTaskCreateCmdExe paymentTaskCreateCmdExe; + private final PaymentTaskUpdateCmdExe paymentTaskUpdateCmdExe; + private final PaymentTaskPageQryExe paymentTaskPageQryExe; + private final PaymentTaskListQryExe paymentTaskListQryExe; + private final PaymentTaskShowQryExe paymentTaskShowQryExe; + private final PaymentTaskDestroyCmdExe paymentTaskDestroyCmdExe; + private final PaymentTaskStatisticsQryExe paymentTaskStatisticsQryExe; + private final PaymentTaskPayCmdExe paymentTaskPayCmdExe; - @Override - public PaymentTaskVO create(PaymentTaskCreateCmd paymentTaskCreateCmd) { - return paymentTaskCreateCmdExe.execute(paymentTaskCreateCmd); - } + @Override + public PaymentTaskVO create(PaymentTaskCreateCmd paymentTaskCreateCmd) { + return paymentTaskCreateCmdExe.execute(paymentTaskCreateCmd); + } - @Override - public PageDTO page(PaymentTaskPageQry paymentTaskPageQry) { - return PageDTO.of(paymentTaskPageQryExe.execute(paymentTaskPageQry)); - } + @Override + public PageDTO page(PaymentTaskPageQry paymentTaskPageQry) { + return PageDTO.of(paymentTaskPageQryExe.execute(paymentTaskPageQry)); + } - @Override - public List list(PaymentTaskListQry paymentTaskListQry) { - return paymentTaskListQryExe.execute(paymentTaskListQry); - } + @Override + public List list(PaymentTaskListQry paymentTaskListQry) { + return paymentTaskListQryExe.execute(paymentTaskListQry); + } - @Override - public PaymentTaskVO update(PaymentTaskUpdateCmd paymentTaskUpdateCmd) { - return paymentTaskUpdateCmdExe.execute(paymentTaskUpdateCmd); - } + @Override + public PaymentTaskVO update(PaymentTaskUpdateCmd paymentTaskUpdateCmd) { + return paymentTaskUpdateCmdExe.execute(paymentTaskUpdateCmd); + } - @Override - public PaymentTaskVO show(PaymentTaskShowQry paymentTaskShowQry) { - return paymentTaskShowQryExe.execute(paymentTaskShowQry); - } + @Override + public PaymentTaskVO show(PaymentTaskShowQry paymentTaskShowQry) { + return paymentTaskShowQryExe.execute(paymentTaskShowQry); + } - @Override - public void destroy(PaymentTaskDestroyCmd paymentTaskDestroyCmd) { - paymentTaskDestroyCmdExe.execute(paymentTaskDestroyCmd); - } + @Override + public void destroy(PaymentTaskDestroyCmd paymentTaskDestroyCmd) { + paymentTaskDestroyCmdExe.execute(paymentTaskDestroyCmd); + } - @Override - public PaymentTaskStatisticsVO statistics(PaymentTaskStatisticsQry statisticsQry) { - return paymentTaskStatisticsQryExe.execute(statisticsQry); - } + @Override + public PaymentTaskStatisticsVO statistics(PaymentTaskStatisticsQry statisticsQry) { + return paymentTaskStatisticsQryExe.execute(statisticsQry); + } - @Override - public PaymentTaskVO pay(PaymentTaskPayCmd paymentTaskPayCmd) { - return paymentTaskPayCmdExe.execute(paymentTaskPayCmd); - } + @Override + public PaymentTaskVO pay(PaymentTaskPayCmd paymentTaskPayCmd) { + return paymentTaskPayCmdExe.execute(paymentTaskPayCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ProductServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ProductServiceImpl.java index 5868342..2c92fd1 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ProductServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ProductServiceImpl.java @@ -3,8 +3,8 @@ package com.xunhong.erp.turbo.biz.app.service; import com.xunhong.erp.turbo.api.biz.api.ProductServiceI; import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductCreateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDestroyCmd; -import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDragCmd; +import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.qry.ProductListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.ProductPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.ProductShowQry; @@ -13,10 +13,10 @@ import com.xunhong.erp.turbo.base.dto.PageDTO; import com.xunhong.erp.turbo.biz.app.executor.cmd.ProductCreateCmdExe; import com.xunhong.erp.turbo.biz.app.executor.cmd.ProductDestroyCmdExe; import com.xunhong.erp.turbo.biz.app.executor.cmd.ProductUpdateCmdExe; +import com.xunhong.erp.turbo.biz.app.executor.query.ProductDragCmdExe; import com.xunhong.erp.turbo.biz.app.executor.query.ProductListQryExe; import com.xunhong.erp.turbo.biz.app.executor.query.ProductPageQryExe; import com.xunhong.erp.turbo.biz.app.executor.query.ProductShowQryExe; -import com.xunhong.erp.turbo.biz.app.executor.query.ProductDragCmdExe; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.dubbo.config.annotation.DubboService; @@ -33,46 +33,46 @@ import java.util.List; @RequiredArgsConstructor public class ProductServiceImpl implements ProductServiceI { - private final ProductCreateCmdExe productCreateCmdExe; - private final ProductUpdateCmdExe productUpdateCmdExe; - private final ProductPageQryExe productPageQryExe; - private final ProductListQryExe productListQryExe; - private final ProductShowQryExe productShowQryExe; - private final ProductDestroyCmdExe productDestroyCmdExe; - private final ProductDragCmdExe productDragCmdExe; + private final ProductCreateCmdExe productCreateCmdExe; + private final ProductUpdateCmdExe productUpdateCmdExe; + private final ProductPageQryExe productPageQryExe; + private final ProductListQryExe productListQryExe; + private final ProductShowQryExe productShowQryExe; + private final ProductDestroyCmdExe productDestroyCmdExe; + private final ProductDragCmdExe productDragCmdExe; - @Override - public ProductVO create(ProductCreateCmd productCreateCmd) { - return productCreateCmdExe.execute(productCreateCmd); - } + @Override + public ProductVO create(ProductCreateCmd productCreateCmd) { + return productCreateCmdExe.execute(productCreateCmd); + } - @Override - public PageDTO page(ProductPageQry productPageQry) { - return PageDTO.of(productPageQryExe.execute(productPageQry)); - } + @Override + public PageDTO page(ProductPageQry productPageQry) { + return PageDTO.of(productPageQryExe.execute(productPageQry)); + } - @Override - public List list(ProductListQry productListQry) { - return productListQryExe.execute(productListQry); - } + @Override + public List list(ProductListQry productListQry) { + return productListQryExe.execute(productListQry); + } - @Override - public ProductVO update(ProductUpdateCmd productUpdateCmd) { - return productUpdateCmdExe.execute(productUpdateCmd); - } + @Override + public ProductVO update(ProductUpdateCmd productUpdateCmd) { + return productUpdateCmdExe.execute(productUpdateCmd); + } - @Override - public ProductVO show(ProductShowQry productShowQry) { - return productShowQryExe.execute(productShowQry); - } + @Override + public ProductVO show(ProductShowQry productShowQry) { + return productShowQryExe.execute(productShowQry); + } - @Override - public void destroy(ProductDestroyCmd productDestroyCmd) { - productDestroyCmdExe.execute(productDestroyCmd); - } - - @Override - public void drag(ProductDragCmd productDragCmd) { - productDragCmdExe.execute(productDragCmd); - } -} \ No newline at end of file + @Override + public void destroy(ProductDestroyCmd productDestroyCmd) { + productDestroyCmdExe.execute(productDestroyCmd); + } + + @Override + public void drag(ProductDragCmd productDragCmd) { + productDragCmdExe.execute(productDragCmd); + } +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationInvoiceServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationInvoiceServiceImpl.java index 066267f..1e57d73 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationInvoiceServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationInvoiceServiceImpl.java @@ -31,41 +31,41 @@ import java.util.List; @RequiredArgsConstructor public class ReconciliationInvoiceServiceImpl implements ReconciliationInvoiceServiceI { - private final ReconciliationInvoiceCreateCmdExe reconciliationInvoiceCreateCmdExe; - private final ReconciliationInvoiceUpdateCmdExe reconciliationInvoiceUpdateCmdExe; - private final ReconciliationInvoicePageQryExe reconciliationInvoicePageQryExe; - private final ReconciliationInvoiceListQryExe reconciliationInvoiceListQryExe; - private final ReconciliationInvoiceShowQryExe reconciliationInvoiceShowQryExe; - private final ReconciliationInvoiceDestroyCmdExe reconciliationInvoiceDestroyCmdExe; + private final ReconciliationInvoiceCreateCmdExe reconciliationInvoiceCreateCmdExe; + private final ReconciliationInvoiceUpdateCmdExe reconciliationInvoiceUpdateCmdExe; + private final ReconciliationInvoicePageQryExe reconciliationInvoicePageQryExe; + private final ReconciliationInvoiceListQryExe reconciliationInvoiceListQryExe; + private final ReconciliationInvoiceShowQryExe reconciliationInvoiceShowQryExe; + private final ReconciliationInvoiceDestroyCmdExe reconciliationInvoiceDestroyCmdExe; - @Override - public ReconciliationInvoiceVO create(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd) { - return reconciliationInvoiceCreateCmdExe.execute(reconciliationInvoiceCreateCmd); - } + @Override + public ReconciliationInvoiceVO create(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd) { + return reconciliationInvoiceCreateCmdExe.execute(reconciliationInvoiceCreateCmd); + } - @Override - public PageDTO page(ReconciliationInvoicePageQry reconciliationInvoicePageQry) { - return PageDTO.of(reconciliationInvoicePageQryExe.execute(reconciliationInvoicePageQry)); - } + @Override + public PageDTO page(ReconciliationInvoicePageQry reconciliationInvoicePageQry) { + return PageDTO.of(reconciliationInvoicePageQryExe.execute(reconciliationInvoicePageQry)); + } - @Override - public List list(ReconciliationInvoiceListQry reconciliationInvoiceListQry) { - return reconciliationInvoiceListQryExe.execute(reconciliationInvoiceListQry); - } + @Override + public List list(ReconciliationInvoiceListQry reconciliationInvoiceListQry) { + return reconciliationInvoiceListQryExe.execute(reconciliationInvoiceListQry); + } - @Override - public ReconciliationInvoiceVO update(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd) { - return reconciliationInvoiceUpdateCmdExe.execute(reconciliationInvoiceUpdateCmd); - } + @Override + public ReconciliationInvoiceVO update(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd) { + return reconciliationInvoiceUpdateCmdExe.execute(reconciliationInvoiceUpdateCmd); + } - @Override - public ReconciliationInvoiceVO show(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry) { - return reconciliationInvoiceShowQryExe.execute(reconciliationInvoiceShowQry); - } + @Override + public ReconciliationInvoiceVO show(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry) { + return reconciliationInvoiceShowQryExe.execute(reconciliationInvoiceShowQry); + } - @Override - public void destroy(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd) { - reconciliationInvoiceDestroyCmdExe.execute(reconciliationInvoiceDestroyCmd); - } + @Override + public void destroy(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd) { + reconciliationInvoiceDestroyCmdExe.execute(reconciliationInvoiceDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationPaymentServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationPaymentServiceImpl.java index a98c8e6..094ba2b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationPaymentServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationPaymentServiceImpl.java @@ -31,41 +31,41 @@ import java.util.List; @RequiredArgsConstructor public class ReconciliationPaymentServiceImpl implements ReconciliationPaymentServiceI { - private final ReconciliationPaymentCreateCmdExe reconciliationPaymentCreateCmdExe; - private final ReconciliationPaymentUpdateCmdExe reconciliationPaymentUpdateCmdExe; - private final ReconciliationPaymentPageQryExe reconciliationPaymentPageQryExe; - private final ReconciliationPaymentListQryExe reconciliationPaymentListQryExe; - private final ReconciliationPaymentShowQryExe reconciliationPaymentShowQryExe; - private final ReconciliationPaymentDestroyCmdExe reconciliationPaymentDestroyCmdExe; + private final ReconciliationPaymentCreateCmdExe reconciliationPaymentCreateCmdExe; + private final ReconciliationPaymentUpdateCmdExe reconciliationPaymentUpdateCmdExe; + private final ReconciliationPaymentPageQryExe reconciliationPaymentPageQryExe; + private final ReconciliationPaymentListQryExe reconciliationPaymentListQryExe; + private final ReconciliationPaymentShowQryExe reconciliationPaymentShowQryExe; + private final ReconciliationPaymentDestroyCmdExe reconciliationPaymentDestroyCmdExe; - @Override - public ReconciliationPaymentVO create(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd) { - return reconciliationPaymentCreateCmdExe.execute(reconciliationPaymentCreateCmd); - } + @Override + public ReconciliationPaymentVO create(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd) { + return reconciliationPaymentCreateCmdExe.execute(reconciliationPaymentCreateCmd); + } - @Override - public PageDTO page(ReconciliationPaymentPageQry reconciliationPaymentPageQry) { - return PageDTO.of(reconciliationPaymentPageQryExe.execute(reconciliationPaymentPageQry)); - } + @Override + public PageDTO page(ReconciliationPaymentPageQry reconciliationPaymentPageQry) { + return PageDTO.of(reconciliationPaymentPageQryExe.execute(reconciliationPaymentPageQry)); + } - @Override - public List list(ReconciliationPaymentListQry reconciliationPaymentListQry) { - return reconciliationPaymentListQryExe.execute(reconciliationPaymentListQry); - } + @Override + public List list(ReconciliationPaymentListQry reconciliationPaymentListQry) { + return reconciliationPaymentListQryExe.execute(reconciliationPaymentListQry); + } - @Override - public ReconciliationPaymentVO update(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd) { - return reconciliationPaymentUpdateCmdExe.execute(reconciliationPaymentUpdateCmd); - } + @Override + public ReconciliationPaymentVO update(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd) { + return reconciliationPaymentUpdateCmdExe.execute(reconciliationPaymentUpdateCmd); + } - @Override - public ReconciliationPaymentVO show(ReconciliationPaymentShowQry reconciliationPaymentShowQry) { - return reconciliationPaymentShowQryExe.execute(reconciliationPaymentShowQry); - } + @Override + public ReconciliationPaymentVO show(ReconciliationPaymentShowQry reconciliationPaymentShowQry) { + return reconciliationPaymentShowQryExe.execute(reconciliationPaymentShowQry); + } - @Override - public void destroy(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd) { - reconciliationPaymentDestroyCmdExe.execute(reconciliationPaymentDestroyCmd); - } + @Override + public void destroy(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd) { + reconciliationPaymentDestroyCmdExe.execute(reconciliationPaymentDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationServiceImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationServiceImpl.java index cb1b07c..1609a0b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationServiceImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/ReconciliationServiceImpl.java @@ -33,47 +33,47 @@ import java.util.List; @RequiredArgsConstructor public class ReconciliationServiceImpl implements ReconciliationServiceI { - private final ReconciliationCreateCmdExe reconciliationCreateCmdExe; - private final ReconciliationUpdateCmdExe reconciliationUpdateCmdExe; - private final ReconciliationPageQryExe reconciliationPageQryExe; - private final ReconciliationListQryExe reconciliationListQryExe; - private final ReconciliationShowQryExe reconciliationShowQryExe; - private final ReconciliationCompleteCmdExe reconciliationCompleteCmdExe; - private final ReconciliationDestroyCmdExe reconciliationDestroyCmdExe; + private final ReconciliationCreateCmdExe reconciliationCreateCmdExe; + private final ReconciliationUpdateCmdExe reconciliationUpdateCmdExe; + private final ReconciliationPageQryExe reconciliationPageQryExe; + private final ReconciliationListQryExe reconciliationListQryExe; + private final ReconciliationShowQryExe reconciliationShowQryExe; + private final ReconciliationCompleteCmdExe reconciliationCompleteCmdExe; + private final ReconciliationDestroyCmdExe reconciliationDestroyCmdExe; - @Override - public ReconciliationVO create(ReconciliationCreateCmd reconciliationCreateCmd) { - return reconciliationCreateCmdExe.execute(reconciliationCreateCmd); - } + @Override + public ReconciliationVO create(ReconciliationCreateCmd reconciliationCreateCmd) { + return reconciliationCreateCmdExe.execute(reconciliationCreateCmd); + } - @Override - public PageDTO page(ReconciliationPageQry reconciliationPageQry) { - return PageDTO.of(reconciliationPageQryExe.execute(reconciliationPageQry)); - } + @Override + public PageDTO page(ReconciliationPageQry reconciliationPageQry) { + return PageDTO.of(reconciliationPageQryExe.execute(reconciliationPageQry)); + } - @Override - public List list(ReconciliationListQry reconciliationListQry) { - return reconciliationListQryExe.execute(reconciliationListQry); - } + @Override + public List list(ReconciliationListQry reconciliationListQry) { + return reconciliationListQryExe.execute(reconciliationListQry); + } - @Override - public ReconciliationVO update(ReconciliationUpdateCmd reconciliationUpdateCmd) { - return reconciliationUpdateCmdExe.execute(reconciliationUpdateCmd); - } + @Override + public ReconciliationVO update(ReconciliationUpdateCmd reconciliationUpdateCmd) { + return reconciliationUpdateCmdExe.execute(reconciliationUpdateCmd); + } - @Override - public ReconciliationVO show(ReconciliationShowQry reconciliationShowQry) { - return reconciliationShowQryExe.execute(reconciliationShowQry); - } + @Override + public ReconciliationVO show(ReconciliationShowQry reconciliationShowQry) { + return reconciliationShowQryExe.execute(reconciliationShowQry); + } - @Override - public ReconciliationVO complete(ReconciliationCompleteCmd reconciliationCompleteCmd) { - return reconciliationCompleteCmdExe.execute(reconciliationCompleteCmd); - } + @Override + public ReconciliationVO complete(ReconciliationCompleteCmd reconciliationCompleteCmd) { + return reconciliationCompleteCmdExe.execute(reconciliationCompleteCmd); + } - @Override - public void destroy(ReconciliationDestroyCmd reconciliationDestroyCmd) { - reconciliationDestroyCmdExe.execute(reconciliationDestroyCmd); - } + @Override + public void destroy(ReconciliationDestroyCmd reconciliationDestroyCmd) { + reconciliationDestroyCmdExe.execute(reconciliationDestroyCmd); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Audit.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Audit.java index ea0c407..e636f75 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Audit.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Audit.java @@ -18,65 +18,65 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class Audit extends DTO { - /** - * 审核Id - */ - private Long auditId; + /** + * 审核Id + */ + private Long auditId; - /** - * 资源Id - */ - private Long subjectId; + /** + * 资源Id + */ + private Long subjectId; - /** - * 资源类型 - */ - private AuditSubjectTypeEnum subjectType; + /** + * 资源类型 + */ + private AuditSubjectTypeEnum subjectType; - /** - * 审核状态: 1_待审核；2_审核中；3_审核通过；4_审核驳回；5_审核撤回 - */ + /** + * 审核状态: 1_待审核；2_审核中；3_审核通过；4_审核驳回；5_审核撤回 + */ private AuditStateEnum state; - /** - * 审核类型：1_审核员审核；2_老板审核 - */ + /** + * 审核类型：1_审核员审核；2_老板审核 + */ private AuditTypeEnum type; - /** - * 驳回原因 - */ - private String auditReason; + /** + * 驳回原因 + */ + private String auditReason; - /** - * 审核时间 - */ - private LocalDateTime auditAt; + /** + * 审核时间 + */ + private LocalDateTime auditAt; - /** - * 审核人ID - */ - private Long auditBy; + /** + * 审核人ID + */ + private Long auditBy; - /** - * 审核人名称 - */ - private String auditByName; + /** + * 审核人名称 + */ + private String auditByName; - /** - * 创建人ID - */ - private Long createdBy; + /** + * 创建人ID + */ + private Long createdBy; - /** - * 创建人姓名 - */ - private String createdByName; + /** + * 创建人姓名 + */ + private String createdByName; - /** - * 创建时间 - */ - private LocalDateTime createdAt; + /** + * 创建时间 + */ + private LocalDateTime createdAt; /** * 采购订单 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxSpec.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxSpec.java index 0e11942..8b939c6 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxSpec.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/BoxSpec.java @@ -16,35 +16,35 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class BoxSpec extends DTO { - /** - * 规格ID - */ - private Long specId; + /** + * 规格ID + */ + private Long specId; - /** - * 规格名称 - */ - private String name; + /** + * 规格名称 + */ + private String name; - /** - * 排序号 - */ - private BigDecimal sort; + /** + * 排序号 + */ + private BigDecimal sort; - /** - * 备注 - */ - private String remark; + /** + * 备注 + */ + private String remark; - /** - * 状态：1_启用；0_禁用 - */ - private Boolean status; + /** + * 状态：1_启用；0_禁用 + */ + private Boolean status; - /** - * 创建时间 - */ - private LocalDateTime createdAt; + /** + * 创建时间 + */ + private LocalDateTime createdAt; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Cost.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Cost.java index 3c063ef..d12188a 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Cost.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Cost.java @@ -19,50 +19,50 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class Cost extends DTO { - /** - * 费用ID - */ - private Long costId; + /** + * 费用ID + */ + private Long costId; /** * 费用类型：1_辅料类型；2_人工类型；3_产地类型；4_其他类型；5_物流类型 */ private CostTypeEnum type; - /** - * 费用归属：0_无归属；1_工头；2_产地；3_司机； - */ - private CostBelongEnum belong; + /** + * 费用归属：0_无归属；1_工头；2_产地；3_司机； + */ + private CostBelongEnum belong; - /** - * 费用名称 - */ - private String name; + /** + * 费用名称 + */ + private String name; - /** - * 单价 - */ - private BigDecimal price; + /** + * 单价 + */ + private BigDecimal price; - /** - * 单位 - */ - private String unit; + /** + * 单位 + */ + private String unit; - /** - * 备注 - */ - private String remark; + /** + * 备注 + */ + private String remark; - /** - * 排序号 - */ - private BigDecimal sort; + /** + * 排序号 + */ + private BigDecimal sort; - /** - * 状态：1_启用；0_禁用 - */ - private Boolean status; + /** + * 状态：1_启用；0_禁用 + */ + private Boolean status; /** * 是否默认 @@ -73,10 +73,10 @@ public class Cost extends DTO { private List costItemList; - /** - * 创建时间 - */ - private LocalDateTime createdAt; + /** + * 创建时间 + */ + private LocalDateTime createdAt; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ExpenseRecord.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ExpenseRecord.java index b4a6f6f..85f0837 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ExpenseRecord.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ExpenseRecord.java @@ -20,35 +20,35 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ExpenseRecord extends DTO { - /** - * 记录ID - */ - private Long expenseRecordId; + /** + * 记录ID + */ + private Long expenseRecordId; - /** - * 记录日期（YYYY-MM-DD） - */ - private LocalDate recordDate; + /** + * 记录日期（YYYY-MM-DD） + */ + private LocalDate recordDate; /** * 计提车次数量 */ private Integer totalVehicleCount; - /** - * 计提总金额 - */ - private BigDecimal totalProvision; + /** + * 计提总金额 + */ + private BigDecimal totalProvision; - /** - * 花销总额 - */ - private BigDecimal totalExpense; + /** + * 花销总额 + */ + private BigDecimal totalExpense; - /** - * 日常利润 - */ - private BigDecimal dailyProfit; + /** + * 日常利润 + */ + private BigDecimal dailyProfit; /** * 花销计提明细 @@ -60,10 +60,10 @@ public class ExpenseRecord extends DTO { */ private List expenseCostList; - /** - * 创建时间 - */ - private LocalDateTime createdAt; + /** + * 创建时间 + */ + private LocalDateTime createdAt; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentRecord.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentRecord.java index a72659a..dc80caf 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentRecord.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentRecord.java @@ -21,114 +21,114 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class PaymentRecord extends DTO { - /** - * 付款记录ID - */ - private Long paymentRecordId; - - /** - * 付款编码 - */ - private String paymentRecordSn; - - /** - * 付款任务ID - */ - private Long paymentTaskId; - - /** - * 付款对象ID - */ - private Long targetId; - - /** - * 付款对象类型：1_瓜农；2_成本项 - */ - private PaymentTargetTypeEnum targetType; - - /** - * 付款公司ID - */ - private Long companyId; - - /** - * 账户类别：1_对公账户；2_私人账户 - */ - private CompanyPaymentAccountCategoryEnum accountCategory; - - /** - * 账户类型：1_银行卡；2_支付宝；3_微信 - */ - private CompanyPaymentAccountTypeEnum accountType; - - /** - * 银行名称 - */ - private String bankName; - - /** - * 支行名称 - */ - private String branchName; - - /** - * 开户公司名称/支付宝昵称/微信号 - */ - private String accountName; - - /** - * 银行账号/支付宝账号/微信账号 - */ - private String accountNumber; - - /** - * 支付时间 - */ - private LocalDateTime paidAt; - - /** - * 付款金额 - */ - private BigDecimal paidAmount; - - /** - * 支付状态：1_草稿；2_已支付； - */ - private PaymentRecordStateEnum paidState; - - /** - * 支付凭证 - */ - private List paidCredentials; - - /** - * 备注 - */ - private String remark; + /** + * 付款记录ID + */ + private Long paymentRecordId; /** - * 创建时间 - */ + * 付款编码 + */ + private String paymentRecordSn; + + /** + * 付款任务ID + */ + private Long paymentTaskId; + + /** + * 付款对象ID + */ + private Long targetId; + + /** + * 付款对象类型：1_瓜农；2_成本项 + */ + private PaymentTargetTypeEnum targetType; + + /** + * 付款公司ID + */ + private Long companyId; + + /** + * 账户类别：1_对公账户；2_私人账户 + */ + private CompanyPaymentAccountCategoryEnum accountCategory; + + /** + * 账户类型：1_银行卡；2_支付宝；3_微信 + */ + private CompanyPaymentAccountTypeEnum accountType; + + /** + * 银行名称 + */ + private String bankName; + + /** + * 支行名称 + */ + private String branchName; + + /** + * 开户公司名称/支付宝昵称/微信号 + */ + private String accountName; + + /** + * 银行账号/支付宝账号/微信账号 + */ + private String accountNumber; + + /** + * 支付时间 + */ + private LocalDateTime paidAt; + + /** + * 付款金额 + */ + private BigDecimal paidAmount; + + /** + * 支付状态：1_草稿；2_已支付； + */ + private PaymentRecordStateEnum paidState; + + /** + * 支付凭证 + */ + private List paidCredentials; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ private LocalDateTime createdAt; /** - * 付款任务 - */ + * 付款任务 + */ private PaymentTask paymentTask; /** - * 供应商 - */ + * 供应商 + */ private Supplier supplier; /** - * 公司 - */ + * 公司 + */ private Company company; /** - * 成本项 - */ + * 成本项 + */ private OrderCost orderCost; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentTask.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentTask.java index 4682ae7..aef35c1 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentTask.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/PaymentTask.java @@ -19,55 +19,55 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class PaymentTask extends DTO { - /** - * 付款任务ID - */ - private Long paymentTaskId; + /** + * 付款任务ID + */ + private Long paymentTaskId; - /** - * 任务名称 - */ - private String taskName; + /** + * 任务名称 + */ + private String taskName; - /** - * 任务类型：1-瓜农付款任务 - */ - private PaymentTaskTypeEnum taskType; + /** + * 任务类型：1-瓜农付款任务 + */ + private PaymentTaskTypeEnum taskType; - /** - * 付款编码 - */ - private String paymentTaskSn; + /** + * 付款编码 + */ + private String paymentTaskSn; - /** - * 付款任务对象ID - */ - private Long targetId; + /** + * 付款任务对象ID + */ + private Long targetId; - /** - * 付款总金额 - */ - private BigDecimal totalAmount; + /** + * 付款总金额 + */ + private BigDecimal totalAmount; - /** - * 已付金额 - */ - private BigDecimal paidAmount; + /** + * 已付金额 + */ + private BigDecimal paidAmount; - /** - * 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 - */ - private PaymentTaskStateEnum state; + /** + * 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 + */ + private PaymentTaskStateEnum state; - /** - * 订单数量 - */ - private Integer orderCount; + /** + * 订单数量 + */ + private Integer orderCount; - /** - * 备注 - */ - private String remark; + /** + * 备注 + */ + private String remark; /** * 创建时间 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Product.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Product.java index d6b747d..a3882f2 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Product.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Product.java @@ -17,35 +17,35 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class Product extends DTO { - /** - * 产品ID - */ - private Long productId; + /** + * 产品ID + */ + private Long productId; - /** - * 产品名称 - */ - private String name; + /** + * 产品名称 + */ + private String name; - /** - * 关联成本费用id - */ - private List costIds; + /** + * 关联成本费用id + */ + private List costIds; - /** - * 备注 - */ - private String remark; + /** + * 备注 + */ + private String remark; - /** - * 排序号 - */ - private BigDecimal sort; + /** + * 排序号 + */ + private BigDecimal sort; - /** - * 状态：1_启用；0_禁用 - */ - private Boolean status; + /** + * 状态：1_启用；0_禁用 + */ + private Boolean status; /** * 成本费用列表 @@ -57,10 +57,10 @@ public class Product extends DTO { */ private String costTemplate; - /** - * 创建时间 - */ - private LocalDateTime createdAt; + /** + * 创建时间 + */ + private LocalDateTime createdAt; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationInvoice.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationInvoice.java index 1365e36..da02f4c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationInvoice.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationInvoice.java @@ -19,60 +19,66 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ReconciliationInvoice extends DTO { - /** - * 对账发票ID - */ - private Long reconciliationInvoiceId; + /** + * 对账发票ID + */ + private Long reconciliationInvoiceId; - /** - * 对账ID - */ - private Long reconciliationId; + /** + * 对账ID + */ + private Long reconciliationId; - /** - * 对账发票编码 - */ - private String invoiceSn; + /** + * 对账发票编码 + */ + private String invoiceSn; - /** - * 经销商ID - */ - private Long dealerId; + /** + * 经销商ID + */ + private Long dealerId; - /** - * 经销商账户ID - */ - private Long accountId; + /** + * 经销商账户ID + */ + private Long accountId; - /** - * 发票金额 - */ - private BigDecimal invoiceAmount; + /** + * 发票金额 + */ + private BigDecimal invoiceAmount; - /** - * 入账公司ID - */ - private Long companyId; + /** + * 入账公司ID + */ + private Long companyId; - /** - * 发票日期 - */ - private LocalDate invoiceDate; + /** + * 发票日期 + */ + private LocalDate invoiceDate; - /** - * 发票图片（支持多张） - */ + /** + * 发票图片（支持多张） + */ private List invoiceImg; - /** - * 备注 - */ - private String remark; + /** + * 备注 + */ + private String remark; - /** - * 创建时间 - */ - private LocalDateTime createdAt; + /** + * 创建时间 + */ + private LocalDateTime createdAt; + + private Dealer dealer; + + private Company company; + + private DealerPaymentAccount dealerPaymentAccount; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationItem.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationItem.java index 48a3fce..6671539 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationItem.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/ReconciliationItem.java @@ -13,25 +13,25 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class ReconciliationItem extends DTO { - /** - * 对账记录ID - */ - private Long reconciliationItemId; + /** + * 对账记录ID + */ + private Long reconciliationItemId; - /** - * 对账ID - */ - private Long reconciliationId; + /** + * 对账ID + */ + private Long reconciliationId; - /** - * 订单ID - */ - private Long orderId; + /** + * 订单ID + */ + private Long orderId; - /** - * 发货单ID - */ - private Long orderShipId; + /** + * 发货单ID + */ + private Long orderShipId; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/SupplierInvoice.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/SupplierInvoice.java index 90c4972..f24b8b7 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/SupplierInvoice.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/SupplierInvoice.java @@ -19,60 +19,60 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class SupplierInvoice extends DTO { - /** - * 发票ID - */ - private Long supplierInvoiceId; + /** + * 发票ID + */ + private Long supplierInvoiceId; /** - * 发票编号 - */ + * 发票编号 + */ private String invoiceSn; - /** - * 发票类型：1_瓜农 - */ - private SupplierInvoiceTypeEnum type; + /** + * 发票类型：1_瓜农 + */ + private SupplierInvoiceTypeEnum type; - /** - * 发票开具人 - */ - private Long supplierId; + /** + * 发票开具人 + */ + private Long supplierId; - /** - * 发票开具人名称 - */ - private String supplierName; + /** + * 发票开具人名称 + */ + private String supplierName; - /** - * 代开发票人的信息 - */ - private List orderSupplierInvoiceList; + /** + * 代开发票人的信息 + */ + private List orderSupplierInvoiceList; - /** - * 发票图片（支持多张） - */ - private List invoiceImg; + /** + * 发票图片（支持多张） + */ + private List invoiceImg; - /** - * 登记时间 - */ - private LocalDateTime registrationTime; + /** + * 登记时间 + */ + private LocalDateTime registrationTime; - /** - * 创建人ID - */ - private Long createdBy; + /** + * 创建人ID + */ + private Long createdBy; - /** - * 创建人姓名 - */ - private String createdByName; + /** + * 创建人姓名 + */ + private String createdByName; - /** - * 创建时间 - */ - private LocalDateTime createdAt; + /** + * 创建时间 + */ + private LocalDateTime createdAt; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/AuditGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/AuditGateway.java index 0811723..c744467 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/AuditGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/AuditGateway.java @@ -11,11 +11,11 @@ import com.xunhong.erp.turbo.biz.domain.entity.Audit; */ public interface AuditGateway { - IPage page(AuditPageQry auditPageQry); + IPage page(AuditPageQry auditPageQry); - Audit update(AuditUpdateCmd auditUpdateCmd); + Audit update(AuditUpdateCmd auditUpdateCmd); - Audit show(AuditShowQry auditShowQry); + Audit show(AuditShowQry auditShowQry); Audit submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/BoxSpecGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/BoxSpecGateway.java index 443853a..0f6eb00 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/BoxSpecGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/BoxSpecGateway.java @@ -15,16 +15,16 @@ import java.util.List; * @author shenyifei */ public interface BoxSpecGateway { - BoxSpec save(BoxSpecCreateCmd boxSpecCreateCmd); + BoxSpec save(BoxSpecCreateCmd boxSpecCreateCmd); - IPage page(BoxSpecPageQry boxSpecPageQry); + IPage page(BoxSpecPageQry boxSpecPageQry); - List list(BoxSpecListQry boxSpecListQry); + List list(BoxSpecListQry boxSpecListQry); - BoxSpec update(BoxSpecUpdateCmd boxSpecUpdateCmd); + BoxSpec update(BoxSpecUpdateCmd boxSpecUpdateCmd); - BoxSpec show(BoxSpecShowQry boxSpecShowQry); + BoxSpec show(BoxSpecShowQry boxSpecShowQry); - void destroy(BoxSpecDestroyCmd boxSpecDestroyCmd); + void destroy(BoxSpecDestroyCmd boxSpecDestroyCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostGateway.java index bb711ce..1e73de3 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/CostGateway.java @@ -16,17 +16,17 @@ import java.util.List; * @author shenyifei */ public interface CostGateway { - Cost save(CostCreateCmd costCreateCmd); + Cost save(CostCreateCmd costCreateCmd); - IPage page(CostPageQry costPageQry); + IPage page(CostPageQry costPageQry); - List list(CostListQry costListQry); + List list(CostListQry costListQry); - Cost update(CostUpdateCmd costUpdateCmd); + Cost update(CostUpdateCmd costUpdateCmd); - Cost show(CostShowQry costShowQry); + Cost show(CostShowQry costShowQry); - void destroy(CostDestroyCmd costDestroyCmd); + void destroy(CostDestroyCmd costDestroyCmd); void drag(CostDragCmd costDragCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/DealerAccountRecordGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/DealerAccountRecordGateway.java index c282ba5..ecea820 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/DealerAccountRecordGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/DealerAccountRecordGateway.java @@ -15,16 +15,16 @@ import java.util.List; * @author shenyifei */ public interface DealerAccountRecordGateway { - DealerAccountRecord save(DealerAccountRecordCreateCmd dealerAccountRecordCreateCmd); + DealerAccountRecord save(DealerAccountRecordCreateCmd dealerAccountRecordCreateCmd); - IPage page(DealerAccountRecordPageQry dealerAccountRecordPageQry); + IPage page(DealerAccountRecordPageQry dealerAccountRecordPageQry); - List list(DealerAccountRecordListQry dealerAccountRecordListQry); + List list(DealerAccountRecordListQry dealerAccountRecordListQry); - DealerAccountRecord update(DealerAccountRecordUpdateCmd dealerAccountRecordUpdateCmd); + DealerAccountRecord update(DealerAccountRecordUpdateCmd dealerAccountRecordUpdateCmd); - DealerAccountRecord show(DealerAccountRecordShowQry dealerAccountRecordShowQry); + DealerAccountRecord show(DealerAccountRecordShowQry dealerAccountRecordShowQry); - void destroy(DealerAccountRecordDestroyCmd dealerAccountRecordDestroyCmd); + void destroy(DealerAccountRecordDestroyCmd dealerAccountRecordDestroyCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ExpenseRecordGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ExpenseRecordGateway.java index 872adf9..cf3294b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ExpenseRecordGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ExpenseRecordGateway.java @@ -12,13 +12,13 @@ import java.util.List; * @author shenyifei */ public interface ExpenseRecordGateway { - ExpenseRecord save(ExpenseRecordCreateCmd expenseRecordCreateCmd); + ExpenseRecord save(ExpenseRecordCreateCmd expenseRecordCreateCmd); - List list(ExpenseRecordListQry expenseRecordListQry); + List list(ExpenseRecordListQry expenseRecordListQry); - ExpenseRecord update(ExpenseRecordUpdateCmd expenseRecordUpdateCmd); + ExpenseRecord update(ExpenseRecordUpdateCmd expenseRecordUpdateCmd); - ExpenseRecord show(ExpenseRecordShowQry expenseRecordShowQry); + ExpenseRecord show(ExpenseRecordShowQry expenseRecordShowQry); void addProvision(Long orderId); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderCostGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderCostGateway.java index 083020d..64b8af1 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderCostGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderCostGateway.java @@ -12,7 +12,7 @@ import com.xunhong.erp.turbo.biz.domain.entity.PaymentRecord; * @author shenyifei */ public interface OrderCostGateway { - IPage page(OrderCostPageQry orderCostPageQry); + IPage page(OrderCostPageQry orderCostPageQry); OrderCost save(OrderCostCreateCmd orderCostCreateCmd); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderGateway.java index 75c3265..82bb1a3 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderGateway.java @@ -15,7 +15,9 @@ public interface OrderGateway { // 新增分步提交方法 Order saveStep1(OrderStep1Cmd orderStep1Cmd); + void saveStep2(OrderStep2Cmd orderStep2Cmd); + void saveStep3(OrderStep3Cmd orderStep3Cmd); IPage page(OrderPageQry orderPageQry); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderRebateGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderRebateGateway.java index ef4b7a1..2e075c4 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderRebateGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderRebateGateway.java @@ -8,6 +8,6 @@ import com.xunhong.erp.turbo.biz.domain.entity.OrderRebate; * @author shenyifei */ public interface OrderRebateGateway { - IPage page(OrderRebatePageQry orderRebatePageQry); + IPage page(OrderRebatePageQry orderRebatePageQry); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderSupplierGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderSupplierGateway.java index c76f9dc..08c3bed 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderSupplierGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/OrderSupplierGateway.java @@ -9,8 +9,8 @@ import com.xunhong.erp.turbo.biz.domain.entity.OrderSupplier; * @author shenyifei */ public interface OrderSupplierGateway { - IPage page(OrderSupplierPageQry orderSupplierPageQry); + IPage page(OrderSupplierPageQry orderSupplierPageQry); - OrderSupplier update(OrderSupplierUpdateCmd orderSupplierUpdateCmd); + OrderSupplier update(OrderSupplierUpdateCmd orderSupplierUpdateCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentRecordGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentRecordGateway.java index a8ec114..9310e13 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentRecordGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentRecordGateway.java @@ -15,16 +15,16 @@ import java.util.List; * @author shenyifei */ public interface PaymentRecordGateway { - PaymentRecord save(PaymentRecordCreateCmd paymentRecordCreateCmd); + PaymentRecord save(PaymentRecordCreateCmd paymentRecordCreateCmd); - IPage page(PaymentRecordPageQry paymentRecordPageQry); + IPage page(PaymentRecordPageQry paymentRecordPageQry); - List list(PaymentRecordListQry paymentRecordListQry); + List list(PaymentRecordListQry paymentRecordListQry); - PaymentRecord update(PaymentRecordUpdateCmd paymentRecordUpdateCmd); + PaymentRecord update(PaymentRecordUpdateCmd paymentRecordUpdateCmd); - PaymentRecord show(PaymentRecordShowQry paymentRecordShowQry); + PaymentRecord show(PaymentRecordShowQry paymentRecordShowQry); - void destroy(PaymentRecordDestroyCmd paymentRecordDestroyCmd); + void destroy(PaymentRecordDestroyCmd paymentRecordDestroyCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentTaskGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentTaskGateway.java index eccffb1..7e37050 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentTaskGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/PaymentTaskGateway.java @@ -18,20 +18,20 @@ import java.util.List; * @author shenyifei */ public interface PaymentTaskGateway { - PaymentTask save(PaymentTaskCreateCmd paymentTaskCreateCmd); + PaymentTask save(PaymentTaskCreateCmd paymentTaskCreateCmd); - IPage page(PaymentTaskPageQry paymentTaskPageQry); + IPage page(PaymentTaskPageQry paymentTaskPageQry); - List list(PaymentTaskListQry paymentTaskListQry); + List list(PaymentTaskListQry paymentTaskListQry); - PaymentTask update(PaymentTaskUpdateCmd paymentTaskUpdateCmd); + PaymentTask update(PaymentTaskUpdateCmd paymentTaskUpdateCmd); - PaymentTask show(PaymentTaskShowQry paymentTaskShowQry); + PaymentTask show(PaymentTaskShowQry paymentTaskShowQry); - void destroy(PaymentTaskDestroyCmd paymentTaskDestroyCmd); + void destroy(PaymentTaskDestroyCmd paymentTaskDestroyCmd); - PaymentTaskStatisticsVO statistics(PaymentTaskStatisticsQry statisticsQry); + PaymentTaskStatisticsVO statistics(PaymentTaskStatisticsQry statisticsQry); - PaymentTask pay(PaymentTaskPayCmd paymentTaskPayCmd); + PaymentTask pay(PaymentTaskPayCmd paymentTaskPayCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ProductGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ProductGateway.java index 55dd14c..795d819 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ProductGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ProductGateway.java @@ -3,8 +3,8 @@ package com.xunhong.erp.turbo.biz.domain.gateway; import com.baomidou.mybatisplus.core.metadata.IPage; import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductCreateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDestroyCmd; -import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductDragCmd; +import com.xunhong.erp.turbo.api.biz.dto.cmd.ProductUpdateCmd; import com.xunhong.erp.turbo.api.biz.dto.qry.ProductListQry; import com.xunhong.erp.turbo.api.biz.dto.qry.ProductPageQry; import com.xunhong.erp.turbo.api.biz.dto.qry.ProductShowQry; @@ -16,17 +16,17 @@ import java.util.List; * @author shenyifei */ public interface ProductGateway { - Product save(ProductCreateCmd productCreateCmd); + Product save(ProductCreateCmd productCreateCmd); - IPage page(ProductPageQry productPageQry); + IPage page(ProductPageQry productPageQry); - List list(ProductListQry productListQry); + List list(ProductListQry productListQry); - Product update(ProductUpdateCmd productUpdateCmd); + Product update(ProductUpdateCmd productUpdateCmd); - Product show(ProductShowQry productShowQry); + Product show(ProductShowQry productShowQry); - void destroy(ProductDestroyCmd productDestroyCmd); - - void drag(ProductDragCmd productDragCmd); -} \ No newline at end of file + void destroy(ProductDestroyCmd productDestroyCmd); + + void drag(ProductDragCmd productDragCmd); +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationGateway.java index e91ed86..bcaeda2 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationGateway.java @@ -16,18 +16,18 @@ import java.util.List; * @author shenyifei */ public interface ReconciliationGateway { - Reconciliation save(ReconciliationCreateCmd reconciliationCreateCmd); + Reconciliation save(ReconciliationCreateCmd reconciliationCreateCmd); - IPage page(ReconciliationPageQry reconciliationPageQry); + IPage page(ReconciliationPageQry reconciliationPageQry); - List list(ReconciliationListQry reconciliationListQry); + List list(ReconciliationListQry reconciliationListQry); - Reconciliation update(ReconciliationUpdateCmd reconciliationUpdateCmd); + Reconciliation update(ReconciliationUpdateCmd reconciliationUpdateCmd); - Reconciliation show(ReconciliationShowQry reconciliationShowQry); + Reconciliation show(ReconciliationShowQry reconciliationShowQry); - Reconciliation complete(ReconciliationCompleteCmd reconciliationCompleteCmd); + Reconciliation complete(ReconciliationCompleteCmd reconciliationCompleteCmd); - void destroy(ReconciliationDestroyCmd reconciliationDestroyCmd); + void destroy(ReconciliationDestroyCmd reconciliationDestroyCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationInvoiceGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationInvoiceGateway.java index 5d9becc..28e63c7 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationInvoiceGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationInvoiceGateway.java @@ -15,16 +15,16 @@ import java.util.List; * @author shenyifei */ public interface ReconciliationInvoiceGateway { - ReconciliationInvoice save(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd); + ReconciliationInvoice save(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd); - IPage page(ReconciliationInvoicePageQry reconciliationInvoicePageQry); + IPage page(ReconciliationInvoicePageQry reconciliationInvoicePageQry); - List list(ReconciliationInvoiceListQry reconciliationInvoiceListQry); + List list(ReconciliationInvoiceListQry reconciliationInvoiceListQry); - ReconciliationInvoice update(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd); + ReconciliationInvoice update(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd); - ReconciliationInvoice show(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry); + ReconciliationInvoice show(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry); - void destroy(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd); + void destroy(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationPaymentGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationPaymentGateway.java index 698eb03..87cbdaf 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationPaymentGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/ReconciliationPaymentGateway.java @@ -15,16 +15,16 @@ import java.util.List; * @author shenyifei */ public interface ReconciliationPaymentGateway { - ReconciliationPayment save(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd); + ReconciliationPayment save(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd); - IPage page(ReconciliationPaymentPageQry reconciliationPaymentPageQry); + IPage page(ReconciliationPaymentPageQry reconciliationPaymentPageQry); - List list(ReconciliationPaymentListQry reconciliationPaymentListQry); + List list(ReconciliationPaymentListQry reconciliationPaymentListQry); - ReconciliationPayment update(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd); + ReconciliationPayment update(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd); - ReconciliationPayment show(ReconciliationPaymentShowQry reconciliationPaymentShowQry); + ReconciliationPayment show(ReconciliationPaymentShowQry reconciliationPaymentShowQry); - void destroy(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd); + void destroy(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierGateway.java index 352e608..9004c44 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierGateway.java @@ -28,6 +28,6 @@ public interface SupplierGateway { void destroy(SupplierDestroyCmd supplierDestroyCmd); - Supplier check(SupplierCheckQry supplierCheckQry); + Supplier check(SupplierCheckQry supplierCheckQry); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierInvoiceGateway.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierInvoiceGateway.java index 767c3ff..b4afd89 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierInvoiceGateway.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/SupplierInvoiceGateway.java @@ -15,16 +15,16 @@ import java.util.List; * @author shenyifei */ public interface SupplierInvoiceGateway { - SupplierInvoice save(SupplierInvoiceCreateCmd supplierInvoiceCreateCmd); + SupplierInvoice save(SupplierInvoiceCreateCmd supplierInvoiceCreateCmd); - IPage page(SupplierInvoicePageQry supplierInvoicePageQry); + IPage page(SupplierInvoicePageQry supplierInvoicePageQry); - List list(SupplierInvoiceListQry supplierInvoiceListQry); + List list(SupplierInvoiceListQry supplierInvoiceListQry); - SupplierInvoice update(SupplierInvoiceUpdateCmd invoiceUpdateCmd); + SupplierInvoice update(SupplierInvoiceUpdateCmd invoiceUpdateCmd); - SupplierInvoice show(SupplierInvoiceShowQry supplierInvoiceShowQry); + SupplierInvoice show(SupplierInvoiceShowQry supplierInvoiceShowQry); - void destroy(SupplierInvoiceDestroyCmd supplierInvoiceDestroyCmd); + void destroy(SupplierInvoiceDestroyCmd supplierInvoiceDestroyCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/AuditConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/AuditConvert.java index 0dd3dab..d4cf7a4 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/AuditConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/AuditConvert.java @@ -14,14 +14,14 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = {OrderConvert.class}) public interface AuditConvert { - @Mapping(target = "order", source = "orderDO") + @Mapping(target = "order", source = "orderDO") Audit toAudit(AuditDO auditDO); - @Mapping(target = "orderDO", ignore = true) + @Mapping(target = "orderDO", ignore = true) @Mapping(target = "version", ignore = true) - @Mapping(target = "updatedAt", ignore = true) - @Mapping(target = "isDelete", ignore = true) - @Mapping(target = "createdAt", ignore = true) - void toAuditDO(@MappingTarget AuditDO auditDO, AuditUpdateCmd auditUpdateCmd); + @Mapping(target = "updatedAt", ignore = true) + @Mapping(target = "isDelete", ignore = true) + @Mapping(target = "createdAt", ignore = true) + void toAuditDO(@MappingTarget AuditDO auditDO, AuditUpdateCmd auditUpdateCmd); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderCostConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderCostConvert.java index 459435f..e6a191e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderCostConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderCostConvert.java @@ -37,7 +37,7 @@ public interface OrderCostConvert { @Mapping(target = "orderCostItemList", ignore = true) @Mapping(target = "orderCompany", ignore = true) @Mapping(target = "orderVehicle", source = "orderVehicleDO") - Order toOrder(OrderDO orderDO); + Order toOrder(OrderDO orderDO); List toOrderCostDOList(List orderCostList); @@ -58,7 +58,7 @@ public interface OrderCostConvert { @Mapping(target = "createdAt", ignore = true) OrderCostDO toOrderCostDO(OrderCostCreateCmd orderCostCreateCmd); - @Mapping(target = "version", ignore = true) + @Mapping(target = "version", ignore = true) @Mapping(target = "updatedAt", ignore = true) @Mapping(target = "targetType", ignore = true) @Mapping(target = "targetId", ignore = true) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderRebateConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderRebateConvert.java index 7b2a26c..c4798cc 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderRebateConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderRebateConvert.java @@ -27,5 +27,5 @@ public interface OrderRebateConvert { @Mapping(target = "orderCostItemList", ignore = true) @Mapping(target = "orderCompany", ignore = true) @Mapping(target = "orderVehicle", source = "orderVehicleDO") - Order toOrder(OrderDO orderDO); + Order toOrder(OrderDO orderDO); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderShipItemConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderShipItemConvert.java index 5ec7757..52c8b86 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderShipItemConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderShipItemConvert.java @@ -13,17 +13,17 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface OrderShipItemConvert { - @Mapping(target = "version", ignore = true) - @Mapping(target = "updatedAt", ignore = true) - @Mapping(target = "isDelete", ignore = true) - @Mapping(target = "createdAt", ignore = true) - OrderShipItemDO toOrderShipItemDO(OrderShipItem orderShipItem); + @Mapping(target = "version", ignore = true) + @Mapping(target = "updatedAt", ignore = true) + @Mapping(target = "isDelete", ignore = true) + @Mapping(target = "createdAt", ignore = true) + OrderShipItemDO toOrderShipItemDO(OrderShipItem orderShipItem); - @Mapping(target = "orderShipItemId", ignore = true) - @Mapping(target = "orderShipId", ignore = true) - @Mapping(target = "version", ignore = true) - @Mapping(target = "updatedAt", ignore = true) - @Mapping(target = "isDelete", ignore = true) - @Mapping(target = "createdAt", ignore = true) - void toOrderShipItemDO(@MappingTarget OrderShipItemDO orderShipItemDO, OrderShipItem orderShipItem); + @Mapping(target = "orderShipItemId", ignore = true) + @Mapping(target = "orderShipId", ignore = true) + @Mapping(target = "version", ignore = true) + @Mapping(target = "updatedAt", ignore = true) + @Mapping(target = "isDelete", ignore = true) + @Mapping(target = "createdAt", ignore = true) + void toOrderShipItemDO(@MappingTarget OrderShipItemDO orderShipItemDO, OrderShipItem orderShipItem); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderSupplierConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderSupplierConvert.java index 23cbc3d..bc82630 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderSupplierConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderSupplierConvert.java @@ -32,7 +32,7 @@ public interface OrderSupplierConvert { @Mapping(target = "orderCostItemList", ignore = true) @Mapping(target = "orderCompany", ignore = true) @Mapping(target = "orderVehicle", source = "orderVehicleDO") - Order toOrder(OrderDO orderDO); + Order toOrder(OrderDO orderDO); @Mapping(target = "orderDO", ignore = true) @Mapping(target = "pricingMethod", ignore = true) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationInvoiceConvert.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationInvoiceConvert.java index 4ff4c90..779b496 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationInvoiceConvert.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/ReconciliationInvoiceConvert.java @@ -15,14 +15,23 @@ import org.mapstruct.NullValueCheckStrategy; @Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface ReconciliationInvoiceConvert { + @Mapping(target = "dealer", source = "dealerDO") + @Mapping(target = "dealerPaymentAccount", source = "dealerPaymentAccountDO") + @Mapping(target = "company", source = "companyDO") ReconciliationInvoice toReconciliationInvoice(ReconciliationInvoiceDO reconciliationInvoiceDO); + @Mapping(target = "dealerPaymentAccountDO", ignore = true) + @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) ReconciliationInvoiceDO toReconciliationInvoiceDO(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd); + @Mapping(target = "dealerPaymentAccountDO", ignore = true) + @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/BoxSpecDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/BoxSpecDO.java index 37287d4..1f107ff 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/BoxSpecDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/BoxSpecDO.java @@ -18,35 +18,35 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) public class BoxSpecDO extends BaseDO { - /** - * 规格ID - */ - @TableId(value = "spec_id", type = IdType.ASSIGN_ID) - private Long specId; + /** + * 规格ID + */ + @TableId(value = "spec_id", type = IdType.ASSIGN_ID) + private Long specId; - /** - * 规格名称 - */ - @TableField(value = "name") - private String name; + /** + * 规格名称 + */ + @TableField(value = "name") + private String name; - /** - * 排序号 - */ - @TableField(value = "sort") - private BigDecimal sort; + /** + * 排序号 + */ + @TableField(value = "sort") + private BigDecimal sort; - /** - * 备注 - */ - @TableField(value = "remark") - private String remark; + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; - /** - * 状态：1_启用；0_禁用 - */ - @TableField(value = "status") - private Boolean status; + /** + * 状态：1_启用；0_禁用 + */ + @TableField(value = "status") + private Boolean status; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CostDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CostDO.java index 1477110..6b7d2fc 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CostDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CostDO.java @@ -22,23 +22,23 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class CostDO extends BaseDO { - /** - * 费用ID - */ - @TableId(value = "cost_id", type = IdType.ASSIGN_ID) - private Long costId; + /** + * 费用ID + */ + @TableId(value = "cost_id", type = IdType.ASSIGN_ID) + private Long costId; /** * 费用类型：1_辅料类型；2_人工类型；3_产地类型；4_其他类型；5_物流类型 */ - @TableField(value = "type") + @TableField(value = "type") private CostTypeEnum type; - /** - * 费用归属：0_无归属；1_工头；2_产地；3_司机； - */ - @TableField(value = "belong") - private CostBelongEnum belong; + /** + * 费用归属：0_无归属；1_工头；2_产地；3_司机； + */ + @TableField(value = "belong") + private CostBelongEnum belong; /** * 关联项目id @@ -46,41 +46,41 @@ public class CostDO extends BaseDO { @TableField(value = "cost_item_ids", typeHandler = JacksonTypeHandler.class) private List costItemIds; - /** - * 费用名称 - */ - @TableField(value = "name") - private String name; + /** + * 费用名称 + */ + @TableField(value = "name") + private String name; - /** - * 单价 - */ - @TableField(value = "price") - private BigDecimal price; + /** + * 单价 + */ + @TableField(value = "price") + private BigDecimal price; - /** - * 单位 - */ - @TableField(value = "unit") - private String unit; + /** + * 单位 + */ + @TableField(value = "unit") + private String unit; - /** - * 备注 - */ - @TableField(value = "remark") - private String remark; + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; - /** - * 排序号 - */ - @TableField(value = "sort") - private BigDecimal sort; + /** + * 排序号 + */ + @TableField(value = "sort") + private BigDecimal sort; - /** - * 状态：1_启用；0_禁用 - */ - @TableField(value = "status") - private Boolean status; + /** + * 状态：1_启用；0_禁用 + */ + @TableField(value = "status") + private Boolean status; /** * 是否默认：1_是；0_否 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseCostDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseCostDO.java index 5db3c8b..5c70093 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseCostDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseCostDO.java @@ -19,47 +19,47 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class ExpenseCostDO extends BaseDO { - /** - * 明细ID - */ - @TableId(value = "expense_cost_id", type = IdType.ASSIGN_ID) - private Long expenseCostId; + /** + * 明细ID + */ + @TableId(value = "expense_cost_id", type = IdType.ASSIGN_ID) + private Long expenseCostId; - /** - * 花销统计记录ID - */ - @TableField(value = "expense_record_id") - private Long expenseRecordId; + /** + * 花销统计记录ID + */ + @TableField(value = "expense_record_id") + private Long expenseRecordId; - /** - * 费用类型ID - */ - @TableField(value = "cost_id") - private Long costId; + /** + * 费用类型ID + */ + @TableField(value = "cost_id") + private Long costId; - /** - * 费用类型名称 - */ - @TableField(value = "cost_name") - private String costName; + /** + * 费用类型名称 + */ + @TableField(value = "cost_name") + private String costName; - /** - * 花销金额 - */ - @TableField(value = "expense_amount") - private BigDecimal expenseAmount; + /** + * 花销金额 + */ + @TableField(value = "expense_amount") + private BigDecimal expenseAmount; - /** - * 备注（可填员工、事由等） - */ - @TableField(value = "remark") - private String remark; + /** + * 备注（可填员工、事由等） + */ + @TableField(value = "remark") + private String remark; - /** - * 创建时间 - */ - @TableField(value = "created_at") - private LocalDateTime createdAt; + /** + * 创建时间 + */ + @TableField(value = "created_at") + private LocalDateTime createdAt; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseProvisionDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseProvisionDO.java index 0c4b996..c10ac30 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseProvisionDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseProvisionDO.java @@ -18,41 +18,41 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) public class ExpenseProvisionDO extends BaseDO { - /** - * 明细ID - */ - @TableId(value = "expense_provision_id", type = IdType.ASSIGN_ID) - private Long expenseProvisionId; + /** + * 明细ID + */ + @TableId(value = "expense_provision_id", type = IdType.ASSIGN_ID) + private Long expenseProvisionId; - /** - * 花销统计记录ID - */ - @TableField(value = "expense_record_id") - private Long expenseRecordId; + /** + * 花销统计记录ID + */ + @TableField(value = "expense_record_id") + private Long expenseRecordId; - /** - * 经销商名称 - */ - @TableField(value = "dealer_name") - private String dealerName; + /** + * 经销商名称 + */ + @TableField(value = "dealer_name") + private String dealerName; - /** - * 车次号 - */ - @TableField(value = "vehicle_no") - private String vehicleNo; + /** + * 车次号 + */ + @TableField(value = "vehicle_no") + private String vehicleNo; - /** - * 计提金额 - */ - @TableField(value = "provision_amount") - private BigDecimal provisionAmount; + /** + * 计提金额 + */ + @TableField(value = "provision_amount") + private BigDecimal provisionAmount; - /** - * 采购单ID - */ - @TableField(value = "order_id") - private Long orderId; + /** + * 采购单ID + */ + @TableField(value = "order_id") + private Long orderId; /** * 备注 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseRecordDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseRecordDO.java index bfe3066..3252dca 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseRecordDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ExpenseRecordDO.java @@ -20,17 +20,17 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ExpenseRecordDO extends BaseDO { - /** - * 记录ID - */ - @TableId(value = "expense_record_id", type = IdType.ASSIGN_ID) - private Long expenseRecordId; + /** + * 记录ID + */ + @TableId(value = "expense_record_id", type = IdType.ASSIGN_ID) + private Long expenseRecordId; - /** - * 记录日期（YYYY-MM-DD） - */ - @TableField(value = "record_date") - private LocalDate recordDate; + /** + * 记录日期（YYYY-MM-DD） + */ + @TableField(value = "record_date") + private LocalDate recordDate; /** * 计提车次数量 @@ -38,23 +38,23 @@ public class ExpenseRecordDO extends BaseDO { @TableField(value = "total_vehicle_count") private Integer totalVehicleCount; - /** - * 计提总金额 - */ - @TableField(value = "total_provision") - private BigDecimal totalProvision; + /** + * 计提总金额 + */ + @TableField(value = "total_provision") + private BigDecimal totalProvision; - /** - * 花销总额 - */ - @TableField(value = "total_expense") - private BigDecimal totalExpense; + /** + * 花销总额 + */ + @TableField(value = "total_expense") + private BigDecimal totalExpense; - /** - * 日常利润 - */ - @TableField(value = "daily_profit") - private BigDecimal dailyProfit; + /** + * 日常利润 + */ + @TableField(value = "daily_profit") + private BigDecimal dailyProfit; @TableField(exist = false) private List expenseProvisionDOList; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCostItemDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCostItemDO.java index e6d1dfd..9177944 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCostItemDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCostItemDO.java @@ -22,71 +22,71 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class OrderCostItemDO extends BaseDO { - /** - * 记录ID - */ - @TableId(value = "order_cost_item_id", type = IdType.ASSIGN_ID) - private Long orderCostItemId; + /** + * 记录ID + */ + @TableId(value = "order_cost_item_id", type = IdType.ASSIGN_ID) + private Long orderCostItemId; - /** - * 订单ID - */ - @TableField(value = "order_id") - private Long orderId; + /** + * 订单ID + */ + @TableField(value = "order_id") + private Long orderId; - /** - * 成本项目ID - */ - @TableField(value = "cost_item_id") - private Long costItemId; + /** + * 成本项目ID + */ + @TableField(value = "cost_item_id") + private Long costItemId; - /** - * 成本项目名称 - */ - @TableField(value = "name") - private String name; + /** + * 成本项目名称 + */ + @TableField(value = "name") + private String name; - /** - * 单价 - */ - @TableField(value = "price") - private BigDecimal price; + /** + * 单价 + */ + @TableField(value = "price") + private BigDecimal price; - /** - * 单位 - */ - @TableField(value = "unit") - private String unit; + /** + * 单位 + */ + @TableField(value = "unit") + private String unit; - /** - * 数量 - */ - @TableField(value = "count") - private Integer count; + /** + * 数量 + */ + @TableField(value = "count") + private Integer count; - /** - * 费用承担方:1-我方,2-对方 - */ - @TableField(value = "payer_type") - private OrderCostPayerTypeEnum payerType; + /** + * 费用承担方:1-我方,2-对方 + */ + @TableField(value = "payer_type") + private OrderCostPayerTypeEnum payerType; - /** - * 项目类型：1_辅料类型；2_人工类型 - */ - @TableField(value = "type") - private CostItemTypeEnum type; + /** + * 项目类型：1_辅料类型；2_人工类型 + */ + @TableField(value = "type") + private CostItemTypeEnum type; - /** - * 录入规则：1_填数量；2_选纸箱；3_数量和金额 - */ - @TableField(value = "rule") - private CostItemRuleEnum rule; + /** + * 录入规则：1_填数量；2_选纸箱；3_数量和金额 + */ + @TableField(value = "rule") + private CostItemRuleEnum rule; - /** - * 创建时间 - */ - @TableField(value = "created_at") - private LocalDateTime createdAt; + /** + * 创建时间 + */ + @TableField(value = "created_at") + private LocalDateTime createdAt; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentRecordDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentRecordDO.java index eb083cf..43c50db 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentRecordDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentRecordDO.java @@ -25,107 +25,107 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class PaymentRecordDO extends BaseDO { - /** - * 付款记录ID - */ - @TableId(value = "payment_record_id", type = IdType.ASSIGN_ID) - private Long paymentRecordId; + /** + * 付款记录ID + */ + @TableId(value = "payment_record_id", type = IdType.ASSIGN_ID) + private Long paymentRecordId; - /** - * 付款编码 - */ - @TableField(value = "payment_record_sn") - private String paymentRecordSn; + /** + * 付款编码 + */ + @TableField(value = "payment_record_sn") + private String paymentRecordSn; - /** - * 付款任务ID - */ - @TableField(value = "payment_task_id") - private Long paymentTaskId; + /** + * 付款任务ID + */ + @TableField(value = "payment_task_id") + private Long paymentTaskId; - /** - * 付款对象ID - */ - @TableField(value = "target_id") - private Long targetId; + /** + * 付款对象ID + */ + @TableField(value = "target_id") + private Long targetId; - /** - * 付款对象类型：1_瓜农；2_成本项 - */ - @TableField(value = "target_type") - private PaymentTargetTypeEnum targetType; + /** + * 付款对象类型：1_瓜农；2_成本项 + */ + @TableField(value = "target_type") + private PaymentTargetTypeEnum targetType; - /** - * 付款公司ID - */ - @TableField(value = "company_id") - private Long companyId; + /** + * 付款公司ID + */ + @TableField(value = "company_id") + private Long companyId; - /** - * 账户类别：1_对公账户；2_私人账户 - */ - @TableField(value = "account_category") - private CompanyPaymentAccountCategoryEnum accountCategory; + /** + * 账户类别：1_对公账户；2_私人账户 + */ + @TableField(value = "account_category") + private CompanyPaymentAccountCategoryEnum accountCategory; - /** - * 账户类型：1_银行卡；2_支付宝；3_微信 - */ - @TableField(value = "account_type") - private CompanyPaymentAccountTypeEnum accountType; + /** + * 账户类型：1_银行卡；2_支付宝；3_微信 + */ + @TableField(value = "account_type") + private CompanyPaymentAccountTypeEnum accountType; - /** - * 银行名称 - */ - @TableField(value = "bank_name") - private String bankName; + /** + * 银行名称 + */ + @TableField(value = "bank_name") + private String bankName; - /** - * 支行名称 - */ - @TableField(value = "branch_name") - private String branchName; + /** + * 支行名称 + */ + @TableField(value = "branch_name") + private String branchName; - /** - * 开户公司名称/支付宝昵称/微信号 - */ - @TableField(value = "account_name") - private String accountName; + /** + * 开户公司名称/支付宝昵称/微信号 + */ + @TableField(value = "account_name") + private String accountName; - /** - * 银行账号/支付宝账号/微信账号 - */ - @TableField(value = "account_number") - private String accountNumber; + /** + * 银行账号/支付宝账号/微信账号 + */ + @TableField(value = "account_number") + private String accountNumber; - /** - * 支付时间 - */ - @TableField(value = "paid_at") - private LocalDateTime paidAt; + /** + * 支付时间 + */ + @TableField(value = "paid_at") + private LocalDateTime paidAt; - /** - * 付款金额 - */ - @TableField(value = "paid_amount") - private BigDecimal paidAmount; + /** + * 付款金额 + */ + @TableField(value = "paid_amount") + private BigDecimal paidAmount; - /** - * 支付状态：1_草稿；2_已支付； - */ - @TableField(value = "paid_state") - private PaymentRecordStateEnum paidState; + /** + * 支付状态：1_草稿；2_已支付； + */ + @TableField(value = "paid_state") + private PaymentRecordStateEnum paidState; - /** - * 支付凭证 - */ - @TableField(value = "paid_credentials", typeHandler = JacksonTypeHandler.class) - private List paidCredentials; + /** + * 支付凭证 + */ + @TableField(value = "paid_credentials", typeHandler = JacksonTypeHandler.class) + private List paidCredentials; - /** - * 备注 - */ - @TableField(value = "remark") - private String remark; + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; @TableField(exist = false) private PaymentTaskDO paymentTaskDO; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskDO.java index 51f2893..1441733 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskDO.java @@ -21,65 +21,65 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class PaymentTaskDO extends BaseDO { - /** - * 付款任务ID - */ - @TableId(value = "payment_task_id", type = IdType.ASSIGN_ID) - private Long paymentTaskId; + /** + * 付款任务ID + */ + @TableId(value = "payment_task_id", type = IdType.ASSIGN_ID) + private Long paymentTaskId; - /** - * 任务名称 - */ - @TableField(value = "task_name") - private String taskName; + /** + * 任务名称 + */ + @TableField(value = "task_name") + private String taskName; - /** - * 任务类型：1-瓜农付款任务 - */ - @TableField(value = "task_type") - private PaymentTaskTypeEnum taskType; + /** + * 任务类型：1-瓜农付款任务 + */ + @TableField(value = "task_type") + private PaymentTaskTypeEnum taskType; - /** - * 付款编码 - */ - @TableField(value = "payment_task_sn") - private String paymentTaskSn; + /** + * 付款编码 + */ + @TableField(value = "payment_task_sn") + private String paymentTaskSn; - /** - * 付款任务对象ID - */ - @TableField(value = "target_id") - private Long targetId; + /** + * 付款任务对象ID + */ + @TableField(value = "target_id") + private Long targetId; - /** - * 付款总金额 - */ - @TableField(value = "total_amount") - private BigDecimal totalAmount; + /** + * 付款总金额 + */ + @TableField(value = "total_amount") + private BigDecimal totalAmount; - /** - * 已付金额 - */ - @TableField(value = "paid_amount") - private BigDecimal paidAmount; + /** + * 已付金额 + */ + @TableField(value = "paid_amount") + private BigDecimal paidAmount; - /** - * 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 - */ - @TableField(value = "state") - private PaymentTaskStateEnum state; + /** + * 付款状态：0-待付款任务，1-部分付款任务，2-已完成任务，3-已取消任务 + */ + @TableField(value = "state") + private PaymentTaskStateEnum state; - /** - * 订单数量 - */ - @TableField(value = "order_count") - private Integer orderCount; + /** + * 订单数量 + */ + @TableField(value = "order_count") + private Integer orderCount; - /** - * 备注 - */ - @TableField(value = "remark") - private String remark; + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; @TableField(exist = false) private SupplierDO supplierDO; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskSupplierDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskSupplierDO.java index 39f93e1..cc2732b 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskSupplierDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/PaymentTaskSupplierDO.java @@ -16,29 +16,29 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class PaymentTaskSupplierDO extends BaseDO { - /** - * 付款任务关联瓜农ID - */ - @TableId(value = "payment_task_supplier_id", type = IdType.ASSIGN_ID) - private Long paymentTaskSupplierId; + /** + * 付款任务关联瓜农ID + */ + @TableId(value = "payment_task_supplier_id", type = IdType.ASSIGN_ID) + private Long paymentTaskSupplierId; - /** - * 付款任务ID - */ - @TableField(value = "payment_task_id") - private Long paymentTaskId; + /** + * 付款任务ID + */ + @TableField(value = "payment_task_id") + private Long paymentTaskId; - /** - * 订单瓜农ID - */ - @TableField(value = "order_supplier_id") - private Long orderSupplierId; + /** + * 订单瓜农ID + */ + @TableField(value = "order_supplier_id") + private Long orderSupplierId; - /** - * 订单ID - */ - @TableField(value = "order_id") - private Long orderId; + /** + * 订单ID + */ + @TableField(value = "order_id") + private Long orderId; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationDO.java index 11462c2..53a8a70 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationDO.java @@ -20,71 +20,71 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ReconciliationDO extends BaseDO { - /** - * 对账ID - */ - @TableId(value = "reconciliation_id", type = IdType.ASSIGN_ID) - private Long reconciliationId; + /** + * 对账ID + */ + @TableId(value = "reconciliation_id", type = IdType.ASSIGN_ID) + private Long reconciliationId; - /** - * 对账编码 - */ - @TableField(value = "reconciliation_sn") - private String reconciliationSn; + /** + * 对账编码 + */ + @TableField(value = "reconciliation_sn") + private String reconciliationSn; - /** - * 经销商ID - */ - @TableField(value = "dealer_id") - private Long dealerId; + /** + * 经销商ID + */ + @TableField(value = "dealer_id") + private Long dealerId; - /** - * 公司ID - */ - @TableField(value = "company_id") - private Long companyId; + /** + * 公司ID + */ + @TableField(value = "company_id") + private Long companyId; - /** - * 原对账金额 - */ - @TableField(value = "original_amount") - private BigDecimal originalAmount; + /** + * 原对账金额 + */ + @TableField(value = "original_amount") + private BigDecimal originalAmount; - /** - * 是否抹零 1是0否 - */ - @TableField(value = "is_rounding") - private Boolean isRounding; + /** + * 是否抹零 1是0否 + */ + @TableField(value = "is_rounding") + private Boolean isRounding; - /** - * 抹零金额 - */ - @TableField(value = "rounding_amount") - private BigDecimal roundingAmount; + /** + * 抹零金额 + */ + @TableField(value = "rounding_amount") + private BigDecimal roundingAmount; - /** - * 抹零备注 - */ - @TableField(value = "rounding_remark") - private String roundingRemark; + /** + * 抹零备注 + */ + @TableField(value = "rounding_remark") + private String roundingRemark; - /** - * 对账金额 - */ - @TableField(value = "reconciliation_amount") - private BigDecimal reconciliationAmount; + /** + * 对账金额 + */ + @TableField(value = "reconciliation_amount") + private BigDecimal reconciliationAmount; - /** - * 状态: 0-待对账, 1-已对账, 2-部分开票, 3-已开票, 4-部分回款, 5-已回款 - */ - @TableField(value = "state") - private ReconciliationStateEnum state; + /** + * 状态: 0-待对账, 1-已对账, 2-部分开票, 3-已开票, 4-部分回款, 5-已回款 + */ + @TableField(value = "state") + private ReconciliationStateEnum state; - /** - * 备注 - */ - @TableField(value = "remark") - private String remark; + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; @TableField(exist = false) private List orderShipDOList; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationInvoiceDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationInvoiceDO.java index 063e71f..4894383 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationInvoiceDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationInvoiceDO.java @@ -12,7 +12,6 @@ import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; /** @@ -23,71 +22,74 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class ReconciliationInvoiceDO extends BaseDO { - /** - * 对账发票ID - */ - @TableId(value = "reconciliation_invoice_id", type = IdType.ASSIGN_ID) - private Long reconciliationInvoiceId; + /** + * 对账发票ID + */ + @TableId(value = "reconciliation_invoice_id", type = IdType.ASSIGN_ID) + private Long reconciliationInvoiceId; - /** - * 对账ID - */ - @TableField(value = "reconciliation_id") - private Long reconciliationId; + /** + * 对账ID + */ + @TableField(value = "reconciliation_id") + private Long reconciliationId; - /** - * 对账发票编码 - */ - @TableField(value = "invoice_sn") - private String invoiceSn; + /** + * 对账发票编码 + */ + @TableField(value = "invoice_sn") + private String invoiceSn; - /** - * 经销商ID - */ - @TableField(value = "dealer_id") - private Long dealerId; + /** + * 经销商ID + */ + @TableField(value = "dealer_id") + private Long dealerId; - /** - * 经销商账户ID - */ - @TableField(value = "account_id") - private Long accountId; + /** + * 经销商账户ID + */ + @TableField(value = "account_id") + private Long accountId; - /** - * 发票金额 - */ - @TableField(value = "invoice_amount") - private BigDecimal invoiceAmount; + /** + * 发票金额 + */ + @TableField(value = "invoice_amount") + private BigDecimal invoiceAmount; - /** - * 入账公司ID - */ - @TableField(value = "company_id") - private Long companyId; + /** + * 入账公司ID + */ + @TableField(value = "company_id") + private Long companyId; - /** - * 发票日期 - */ - @TableField(value = "invoice_date") - private LocalDate invoiceDate; + /** + * 发票日期 + */ + @TableField(value = "invoice_date") + private LocalDate invoiceDate; - /** - * 发票图片（支持多张） - */ - @TableField(value = "invoice_img", typeHandler = JacksonTypeHandler.class) + /** + * 发票图片（支持多张） + */ + @TableField(value = "invoice_img", typeHandler = JacksonTypeHandler.class) private List invoiceImg; - /** - * 备注 - */ - @TableField(value = "remark") - private String remark; + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; - /** - * 创建时间 - */ - @TableField(value = "created_at") - private LocalDateTime createdAt; + @TableField(exist = false) + private DealerDO dealerDO; + + @TableField(exist = false) + private CompanyDO companyDO; + + @TableField(exist = false) + private DealerPaymentAccountDO dealerPaymentAccountDO; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationItemDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationItemDO.java index 99b3874..18dd7e4 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationItemDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/ReconciliationItemDO.java @@ -16,29 +16,29 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class ReconciliationItemDO extends BaseDO { - /** - * 对账记录ID - */ - @TableId(value = "reconciliation_item_id", type = IdType.ASSIGN_ID) - private Long reconciliationItemId; + /** + * 对账记录ID + */ + @TableId(value = "reconciliation_item_id", type = IdType.ASSIGN_ID) + private Long reconciliationItemId; - /** - * 对账ID - */ - @TableField(value = "reconciliation_id") - private Long reconciliationId; + /** + * 对账ID + */ + @TableField(value = "reconciliation_id") + private Long reconciliationId; - /** - * 订单ID - */ - @TableField(value = "order_id") - private Long orderId; + /** + * 订单ID + */ + @TableField(value = "order_id") + private Long orderId; - /** - * 发货单ID - */ - @TableField(value = "order_ship_id") - private Long orderShipId; + /** + * 发货单ID + */ + @TableField(value = "order_ship_id") + private Long orderShipId; @TableField(exist = false) private OrderDO orderDO; 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 de74cd8..2ce941d 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 @@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +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.datasource.domain.entity.BaseDO; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.List; /** * @author shenyifei @@ -19,89 +23,95 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class ReconciliationPaymentDO extends BaseDO { - /** - * 对账付款ID - */ - @TableId(value = "reconciliation_payment_id", type = IdType.ASSIGN_ID) - private Long reconciliationPaymentId; + /** + * 对账付款ID + */ + @TableId(value = "reconciliation_payment_id", type = IdType.ASSIGN_ID) + private Long reconciliationPaymentId; - /** - * 对账ID - */ - @TableField(value = "reconciliation_id") - private Long reconciliationId; + /** + * 对账ID + */ + @TableField(value = "reconciliation_id") + private Long reconciliationId; - /** - * 经销商ID - */ - @TableField(value = "dealer_id") - private Long dealerId; + /** + * 经销商ID + */ + @TableField(value = "dealer_id") + private Long dealerId; - /** - * 我方收款公司ID - */ - @TableField(value = "company_id") - private Long companyId; + /** + * 我方收款公司ID + */ + @TableField(value = "company_id") + private Long companyId; - /** - * 我方收款公司账户ID - */ - @TableField(value = "account_id") - private Long accountId; + /** + * 我方收款公司账户ID + */ + @TableField(value = "account_id") + private Long accountId; - /** - * 账户类别：1_对公账户；2_私人账户 - */ - @TableField(value = "account_category") - private Boolean accountCategory; + /** + * 账户类别：1_对公账户；2_私人账户 + */ + @TableField(value = "account_category") + private CompanyPaymentAccountCategoryEnum accountCategory; - /** - * 账户类型：1_银行卡；2_支付宝；3_微信 - */ - @TableField(value = "account_type") - private Boolean accountType; + /** + * 账户类型：1_银行卡；2_支付宝；3_微信 + */ + @TableField(value = "account_type") + private CompanyPaymentAccountTypeEnum accountType; - /** - * 银行名称 - */ - @TableField(value = "bank_name") - private String bankName; + /** + * 银行名称 + */ + @TableField(value = "bank_name") + private String bankName; - /** - * 支行名称 - */ - @TableField(value = "branch_name") - private String branchName; + /** + * 支行名称 + */ + @TableField(value = "branch_name") + private String branchName; - /** - * 开户公司名称/支付宝昵称/微信号 - */ - @TableField(value = "account_name") - private String accountName; + /** + * 开户公司名称/支付宝昵称/微信号 + */ + @TableField(value = "account_name") + private String accountName; - /** - * 银行账号/支付宝账号/微信账号 - */ - @TableField(value = "account_number") - private String accountNumber; + /** + * 银行账号/支付宝账号/微信账号 + */ + @TableField(value = "account_number") + private String accountNumber; - /** - * 回款时间 - */ - @TableField(value = "return_at") - private LocalDateTime returnAt; + /** + * 回款时间 + */ + @TableField(value = "paid_at") + private LocalDateTime paidAt; - /** - * 回款金额 - */ - @TableField(value = "return_amount") - private BigDecimal returnAmount; + /** + * 回款金额 + */ + @TableField(value = "paid_amount") + private BigDecimal paidAmount; - /** - * 备注 - */ - @TableField(value = "remark") - private String remark; + /** + * 回款凭证 + */ + @TableField(value = "paid_credentials", typeHandler = JacksonTypeHandler.class) + private List paidCredentials; + + /** + * 备注 + */ + @TableField(value = "remark") + private String remark; } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxSpecGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxSpecGatewayImpl.java index 53a5768..e2f4ce0 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxSpecGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/BoxSpecGatewayImpl.java @@ -26,37 +26,37 @@ import java.util.List; @Repository @RequiredArgsConstructor public class BoxSpecGatewayImpl implements BoxSpecGateway { - private final BoxSpecMapper boxSpecMapper; - private final BoxSpecConvert boxSpecConvert; + private final BoxSpecMapper boxSpecMapper; + private final BoxSpecConvert boxSpecConvert; - @Override - public BoxSpec save(BoxSpecCreateCmd boxSpecCreateCmd) { - BoxSpecDO boxSpecDO = boxSpecConvert.toBoxSpecDO(boxSpecCreateCmd); - boxSpecMapper.insert(boxSpecDO); + @Override + public BoxSpec save(BoxSpecCreateCmd boxSpecCreateCmd) { + BoxSpecDO boxSpecDO = boxSpecConvert.toBoxSpecDO(boxSpecCreateCmd); + boxSpecMapper.insert(boxSpecDO); - return boxSpecConvert.toBoxSpec(boxSpecDO); - } + return boxSpecConvert.toBoxSpec(boxSpecDO); + } - @Override - public IPage page(BoxSpecPageQry boxSpecPageQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); + @Override + public IPage page(BoxSpecPageQry boxSpecPageQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); queryWrapper.orderByDesc(BoxSpecDO::getCreatedAt); - IPage page = new Page<>(boxSpecPageQry.getPageIndex(), boxSpecPageQry.getPageSize()); - page = boxSpecMapper.selectPage(page, queryWrapper); + IPage page = new Page<>(boxSpecPageQry.getPageIndex(), boxSpecPageQry.getPageSize()); + page = boxSpecMapper.selectPage(page, queryWrapper); - return page.convert(boxSpecConvert::toBoxSpec); - } + return page.convert(boxSpecConvert::toBoxSpec); + } - @Override - public List list(BoxSpecListQry boxSpecListQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); + @Override + public List list(BoxSpecListQry boxSpecListQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); List boxSpecDOList = boxSpecMapper.selectList(queryWrapper); - return boxSpecDOList.stream().map(boxSpecConvert::toBoxSpec).toList(); - } + return boxSpecDOList.stream().map(boxSpecConvert::toBoxSpec).toList(); + } - @Override - public BoxSpec update(BoxSpecUpdateCmd boxSpecUpdateCmd) { + @Override + public BoxSpec update(BoxSpecUpdateCmd boxSpecUpdateCmd) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); queryWrapper.eq(BoxSpecDO::getSpecId, boxSpecUpdateCmd.getSpecId()); queryWrapper.last("limit 1"); @@ -66,27 +66,27 @@ public class BoxSpecGatewayImpl implements BoxSpecGateway { boxSpecConvert.toBoxSpecDO(boxSpecDO, boxSpecUpdateCmd); boxSpecMapper.updateById(boxSpecDO); - return boxSpecConvert.toBoxSpec(boxSpecDO); - } + return boxSpecConvert.toBoxSpec(boxSpecDO); + } - @Override - public BoxSpec show(BoxSpecShowQry boxSpecShowQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); - queryWrapper.eq(BoxSpecDO::getSpecId, boxSpecShowQry.getSpecId()); - queryWrapper.last("limit 1"); + @Override + public BoxSpec show(BoxSpecShowQry boxSpecShowQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); + queryWrapper.eq(BoxSpecDO::getSpecId, boxSpecShowQry.getSpecId()); + queryWrapper.last("limit 1"); - BoxSpecDO boxSpecDO = boxSpecMapper.selectOne(queryWrapper); - return boxSpecConvert.toBoxSpec(boxSpecDO); - } + BoxSpecDO boxSpecDO = boxSpecMapper.selectOne(queryWrapper); + return boxSpecConvert.toBoxSpec(boxSpecDO); + } - @Override - public void destroy(BoxSpecDestroyCmd boxSpecDestroyCmd) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); - queryWrapper.eq(BoxSpecDO::getSpecId, boxSpecDestroyCmd.getSpecId()); - queryWrapper.last("limit 1"); + @Override + public void destroy(BoxSpecDestroyCmd boxSpecDestroyCmd) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(BoxSpecDO.class); + queryWrapper.eq(BoxSpecDO::getSpecId, boxSpecDestroyCmd.getSpecId()); + queryWrapper.last("limit 1"); - BoxSpecDO boxSpecDO = boxSpecMapper.selectOne(queryWrapper); - boxSpecDO.deleteById(); - } + BoxSpecDO boxSpecDO = boxSpecMapper.selectOne(queryWrapper); + boxSpecDO.deleteById(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java index c559ea6..8444ff5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java @@ -14,7 +14,6 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.CompanyShowQry; import com.xunhong.erp.turbo.biz.domain.entity.Company; import com.xunhong.erp.turbo.biz.domain.gateway.CompanyGateway; import com.xunhong.erp.turbo.biz.infrastructure.convert.CompanyConvert; -import com.xunhong.erp.turbo.biz.infrastructure.entity.BoxProductDO; import com.xunhong.erp.turbo.biz.infrastructure.entity.CompanyDO; import com.xunhong.erp.turbo.biz.infrastructure.mapper.CompanyMapper; import lombok.RequiredArgsConstructor; diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderCostGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderCostGatewayImpl.java index fb742e3..c307543 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderCostGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderCostGatewayImpl.java @@ -111,7 +111,7 @@ public class OrderCostGatewayImpl implements OrderCostGateway { } OrderCompanyDO orderCompanyDO = orderCompanyMapper.selectOne(Wrappers.lambdaQuery(OrderCompanyDO.class) - .eq(OrderCompanyDO::getOrderId, orderCostDO.getOrderId())); + .eq(OrderCompanyDO::getOrderId, orderCostDO.getOrderId())); if (Objects.nonNull(orderCompanyDO)) { orderCostDO.setOrderCompanyDO(orderCompanyDO); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java index 66e8c53..39a5a3d 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java @@ -774,6 +774,7 @@ public class OrderGatewayImpl implements OrderGateway { OrderVehicleDO orderVehicleDO = orderVehicleConvert.toOrderVehicleDO(orderVehicle); if (orderVehicle.getVehicleId() != null) { + orderVehicleDO.setVehicleId(orderVehicle.getVehicleId()); orderVehicleMapper.updateById(orderVehicleDO); } else { // 检查是否已存在车辆信息 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PaymentRecordGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PaymentRecordGatewayImpl.java index e7a3386..5de6dcb 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PaymentRecordGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/PaymentRecordGatewayImpl.java @@ -34,8 +34,8 @@ import java.util.stream.Collectors; @Repository @RequiredArgsConstructor public class PaymentRecordGatewayImpl implements PaymentRecordGateway { - private final PaymentRecordMapper paymentRecordMapper; - private final PaymentRecordConvert paymentRecordConvert; + private final PaymentRecordMapper paymentRecordMapper; + private final PaymentRecordConvert paymentRecordConvert; private final PaymentTaskMapper paymentTaskMapper; private final SupplierMapper supplierMapper; @@ -43,17 +43,17 @@ public class PaymentRecordGatewayImpl implements PaymentRecordGateway { private final OrderCostMapper orderCostMapper; - @Override - public PaymentRecord save(PaymentRecordCreateCmd paymentRecordCreateCmd) { - PaymentRecordDO paymentRecordDO = paymentRecordConvert.toPaymentRecordDO(paymentRecordCreateCmd); - paymentRecordMapper.insert(paymentRecordDO); + @Override + public PaymentRecord save(PaymentRecordCreateCmd paymentRecordCreateCmd) { + PaymentRecordDO paymentRecordDO = paymentRecordConvert.toPaymentRecordDO(paymentRecordCreateCmd); + paymentRecordMapper.insert(paymentRecordDO); - return paymentRecordConvert.toPaymentRecord(paymentRecordDO); - } + return paymentRecordConvert.toPaymentRecord(paymentRecordDO); + } - @Override - public IPage page(PaymentRecordPageQry paymentRecordPageQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); + @Override + public IPage page(PaymentRecordPageQry paymentRecordPageQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); queryWrapper.eq(Objects.nonNull(paymentRecordPageQry.getPaymentTaskId()), PaymentRecordDO::getPaymentTaskId, paymentRecordPageQry.getPaymentTaskId()); queryWrapper.eq(Objects.nonNull(paymentRecordPageQry.getPaymentRecordId()), PaymentRecordDO::getPaymentRecordId, paymentRecordPageQry.getPaymentRecordId()); queryWrapper.eq(Objects.nonNull(paymentRecordPageQry.getTargetType()), PaymentRecordDO::getTargetType, paymentRecordPageQry.getTargetType()); @@ -66,8 +66,8 @@ public class PaymentRecordGatewayImpl implements PaymentRecordGateway { queryWrapper.like(StrUtil.isNotBlank(paymentRecordPageQry.getPaymentRecordSn()), PaymentRecordDO::getPaymentRecordSn, paymentRecordPageQry.getPaymentRecordSn()); queryWrapper.orderByDesc(PaymentRecordDO::getCreatedAt); - IPage page = new Page<>(paymentRecordPageQry.getPageIndex(), paymentRecordPageQry.getPageSize()); - page = paymentRecordMapper.selectPage(page, queryWrapper, paymentRecordPageQry); + IPage page = new Page<>(paymentRecordPageQry.getPageIndex(), paymentRecordPageQry.getPageSize()); + page = paymentRecordMapper.selectPage(page, queryWrapper, paymentRecordPageQry); if (PaymentTargetTypeEnum.SUPPLIER.equals(paymentRecordPageQry.getTargetType())) { Set paymentTaskIdList = page.getRecords().stream().map(PaymentRecordDO::getPaymentTaskId).collect(Collectors.toSet()); @@ -118,17 +118,17 @@ public class PaymentRecordGatewayImpl implements PaymentRecordGateway { } return page.convert(paymentRecordConvert::toPaymentRecord); - } + } - @Override - public List list(PaymentRecordListQry paymentRecordListQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); + @Override + public List list(PaymentRecordListQry paymentRecordListQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); List paymentRecordDOList = paymentRecordMapper.selectList(queryWrapper); - return paymentRecordDOList.stream().map(paymentRecordConvert::toPaymentRecord).toList(); - } + return paymentRecordDOList.stream().map(paymentRecordConvert::toPaymentRecord).toList(); + } - @Override - public PaymentRecord update(PaymentRecordUpdateCmd paymentRecordUpdateCmd) { + @Override + public PaymentRecord update(PaymentRecordUpdateCmd paymentRecordUpdateCmd) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); queryWrapper.eq(PaymentRecordDO::getPaymentRecordId, paymentRecordUpdateCmd.getPaymentRecordId()); queryWrapper.last("limit 1"); @@ -138,27 +138,27 @@ public class PaymentRecordGatewayImpl implements PaymentRecordGateway { paymentRecordConvert.toPaymentRecordDO(paymentRecordDO, paymentRecordUpdateCmd); paymentRecordMapper.updateById(paymentRecordDO); - return paymentRecordConvert.toPaymentRecord(paymentRecordDO); - } + return paymentRecordConvert.toPaymentRecord(paymentRecordDO); + } - @Override - public PaymentRecord show(PaymentRecordShowQry paymentRecordShowQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); - queryWrapper.eq(PaymentRecordDO::getPaymentRecordId, paymentRecordShowQry.getPaymentRecordId()); - queryWrapper.last("limit 1"); + @Override + public PaymentRecord show(PaymentRecordShowQry paymentRecordShowQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); + queryWrapper.eq(PaymentRecordDO::getPaymentRecordId, paymentRecordShowQry.getPaymentRecordId()); + queryWrapper.last("limit 1"); - PaymentRecordDO paymentRecordDO = paymentRecordMapper.selectOne(queryWrapper); - return paymentRecordConvert.toPaymentRecord(paymentRecordDO); - } + PaymentRecordDO paymentRecordDO = paymentRecordMapper.selectOne(queryWrapper); + return paymentRecordConvert.toPaymentRecord(paymentRecordDO); + } - @Override - public void destroy(PaymentRecordDestroyCmd paymentRecordDestroyCmd) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); - queryWrapper.eq(PaymentRecordDO::getPaymentRecordId, paymentRecordDestroyCmd.getPaymentRecordId()); - queryWrapper.last("limit 1"); + @Override + public void destroy(PaymentRecordDestroyCmd paymentRecordDestroyCmd) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(PaymentRecordDO.class); + queryWrapper.eq(PaymentRecordDO::getPaymentRecordId, paymentRecordDestroyCmd.getPaymentRecordId()); + queryWrapper.last("limit 1"); - PaymentRecordDO paymentRecordDO = paymentRecordMapper.selectOne(queryWrapper); - paymentRecordDO.deleteById(); - } + PaymentRecordDO paymentRecordDO = paymentRecordMapper.selectOne(queryWrapper); + paymentRecordDO.deleteById(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationInvoiceGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationInvoiceGatewayImpl.java index f6032a3..d05d14e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationInvoiceGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/ReconciliationInvoiceGatewayImpl.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,13 +15,24 @@ import com.xunhong.erp.turbo.api.biz.dto.qry.ReconciliationInvoiceShowQry; import com.xunhong.erp.turbo.biz.domain.entity.ReconciliationInvoice; import com.xunhong.erp.turbo.biz.domain.gateway.ReconciliationInvoiceGateway; import com.xunhong.erp.turbo.biz.infrastructure.convert.ReconciliationInvoiceConvert; +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.DealerPaymentAccountDO; import com.xunhong.erp.turbo.biz.infrastructure.entity.ReconciliationInvoiceDO; +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.DealerPaymentAccountMapper; import com.xunhong.erp.turbo.biz.infrastructure.mapper.ReconciliationInvoiceMapper; import com.xunhong.erp.turbo.biz.util.SerialNumberGenerator; 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 @@ -27,38 +40,72 @@ import java.util.List; @Repository @RequiredArgsConstructor public class ReconciliationInvoiceGatewayImpl implements ReconciliationInvoiceGateway { - private final ReconciliationInvoiceMapper reconciliationInvoiceMapper; - private final ReconciliationInvoiceConvert reconciliationInvoiceConvert; + private final ReconciliationInvoiceMapper reconciliationInvoiceMapper; + private final ReconciliationInvoiceConvert reconciliationInvoiceConvert; - @Override - public ReconciliationInvoice save(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd) { - ReconciliationInvoiceDO reconciliationInvoiceDO = reconciliationInvoiceConvert.toReconciliationInvoiceDO(reconciliationInvoiceCreateCmd); + private final DealerMapper dealerMapper; + private final CompanyMapper companyMapper; + private final DealerPaymentAccountMapper dealerPaymentAccountMapper; + + @Override + public ReconciliationInvoice save(ReconciliationInvoiceCreateCmd reconciliationInvoiceCreateCmd) { + ReconciliationInvoiceDO reconciliationInvoiceDO = reconciliationInvoiceConvert.toReconciliationInvoiceDO(reconciliationInvoiceCreateCmd); reconciliationInvoiceDO.setInvoiceSn(SerialNumberGenerator.generate("INV")); - reconciliationInvoiceMapper.insert(reconciliationInvoiceDO); + reconciliationInvoiceMapper.insert(reconciliationInvoiceDO); - return reconciliationInvoiceConvert.toReconciliationInvoice(reconciliationInvoiceDO); - } + return reconciliationInvoiceConvert.toReconciliationInvoice(reconciliationInvoiceDO); + } + + @Override + public IPage page(ReconciliationInvoicePageQry reconciliationInvoicePageQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); + queryWrapper.eq(Objects.nonNull(reconciliationInvoicePageQry.getReconciliationId()), ReconciliationInvoiceDO::getReconciliationId, reconciliationInvoicePageQry.getReconciliationId()); + queryWrapper.like(StrUtil.isNotBlank(reconciliationInvoicePageQry.getInvoiceSn()), ReconciliationInvoiceDO::getInvoiceSn, reconciliationInvoicePageQry.getInvoiceSn()); + queryWrapper.eq(Objects.nonNull(reconciliationInvoicePageQry.getCompanyId()), ReconciliationInvoiceDO::getCompanyId, reconciliationInvoicePageQry.getCompanyId()); + queryWrapper.eq(Objects.nonNull(reconciliationInvoicePageQry.getDealerId()), ReconciliationInvoiceDO::getDealerId, reconciliationInvoicePageQry.getDealerId()); + + if (CollUtil.isNotEmpty(reconciliationInvoicePageQry.getInvoiceDate())) { + queryWrapper.between(ReconciliationInvoiceDO::getInvoiceDate, reconciliationInvoicePageQry.getInvoiceDate().get(0), reconciliationInvoicePageQry.getInvoiceDate().get(1)); + } - @Override - public IPage page(ReconciliationInvoicePageQry reconciliationInvoicePageQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); queryWrapper.orderByDesc(ReconciliationInvoiceDO::getCreatedAt); - IPage page = new Page<>(reconciliationInvoicePageQry.getPageIndex(), reconciliationInvoicePageQry.getPageSize()); - page = reconciliationInvoiceMapper.selectPage(page, queryWrapper); + IPage page = new Page<>(reconciliationInvoicePageQry.getPageIndex(), reconciliationInvoicePageQry.getPageSize()); + page = reconciliationInvoiceMapper.selectPage(page, queryWrapper); - return page.convert(reconciliationInvoiceConvert::toReconciliationInvoice); - } + Set dealerIdList = page.getRecords().stream().map(ReconciliationInvoiceDO::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(reconciliationInvoiceDO -> reconciliationInvoiceDO.setDealerDO(dealerDOMap.get(reconciliationInvoiceDO.getDealerId()))); + } - @Override - public List list(ReconciliationInvoiceListQry reconciliationInvoiceListQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); + Set companyIdList = page.getRecords().stream().map(ReconciliationInvoiceDO::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(reconciliationInvoiceDO -> reconciliationInvoiceDO.setCompanyDO(companyDOMap.get(reconciliationInvoiceDO.getCompanyId()))); + } + + Set dealerPaymentAccountIdList = page.getRecords().stream().map(ReconciliationInvoiceDO::getAccountId).collect(Collectors.toSet()); + if (CollUtil.isNotEmpty(dealerPaymentAccountIdList)) { + List dealerPaymentAccountDOList = dealerPaymentAccountMapper.selectByIds(dealerPaymentAccountIdList); + Map dealerPaymentAccountDOMap = dealerPaymentAccountDOList.stream().collect(Collectors.toMap(DealerPaymentAccountDO::getAccountId, Function.identity())); + page.getRecords().forEach(reconciliationInvoiceDO -> reconciliationInvoiceDO.setDealerPaymentAccountDO(dealerPaymentAccountDOMap.get(reconciliationInvoiceDO.getAccountId()))); + } + + return page.convert(reconciliationInvoiceConvert::toReconciliationInvoice); + } + + @Override + public List list(ReconciliationInvoiceListQry reconciliationInvoiceListQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); List reconciliationInvoiceDOList = reconciliationInvoiceMapper.selectList(queryWrapper); - return reconciliationInvoiceDOList.stream().map(reconciliationInvoiceConvert::toReconciliationInvoice).toList(); - } + return reconciliationInvoiceDOList.stream().map(reconciliationInvoiceConvert::toReconciliationInvoice).toList(); + } - @Override - public ReconciliationInvoice update(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd) { + @Override + public ReconciliationInvoice update(ReconciliationInvoiceUpdateCmd reconciliationInvoiceUpdateCmd) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); queryWrapper.eq(ReconciliationInvoiceDO::getReconciliationInvoiceId, reconciliationInvoiceUpdateCmd.getReconciliationInvoiceId()); queryWrapper.last("limit 1"); @@ -68,27 +115,27 @@ public class ReconciliationInvoiceGatewayImpl implements ReconciliationInvoiceGa reconciliationInvoiceConvert.toReconciliationInvoiceDO(reconciliationInvoiceDO, reconciliationInvoiceUpdateCmd); reconciliationInvoiceMapper.updateById(reconciliationInvoiceDO); - return reconciliationInvoiceConvert.toReconciliationInvoice(reconciliationInvoiceDO); - } + return reconciliationInvoiceConvert.toReconciliationInvoice(reconciliationInvoiceDO); + } - @Override - public ReconciliationInvoice show(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); - queryWrapper.eq(ReconciliationInvoiceDO::getReconciliationInvoiceId, reconciliationInvoiceShowQry.getReconciliationInvoiceId()); - queryWrapper.last("limit 1"); + @Override + public ReconciliationInvoice show(ReconciliationInvoiceShowQry reconciliationInvoiceShowQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); + queryWrapper.eq(ReconciliationInvoiceDO::getReconciliationInvoiceId, reconciliationInvoiceShowQry.getReconciliationInvoiceId()); + queryWrapper.last("limit 1"); - ReconciliationInvoiceDO reconciliationInvoiceDO = reconciliationInvoiceMapper.selectOne(queryWrapper); - return reconciliationInvoiceConvert.toReconciliationInvoice(reconciliationInvoiceDO); - } + ReconciliationInvoiceDO reconciliationInvoiceDO = reconciliationInvoiceMapper.selectOne(queryWrapper); + return reconciliationInvoiceConvert.toReconciliationInvoice(reconciliationInvoiceDO); + } - @Override - public void destroy(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); - queryWrapper.eq(ReconciliationInvoiceDO::getReconciliationInvoiceId, reconciliationInvoiceDestroyCmd.getReconciliationInvoiceId()); - queryWrapper.last("limit 1"); + @Override + public void destroy(ReconciliationInvoiceDestroyCmd reconciliationInvoiceDestroyCmd) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationInvoiceDO.class); + queryWrapper.eq(ReconciliationInvoiceDO::getReconciliationInvoiceId, reconciliationInvoiceDestroyCmd.getReconciliationInvoiceId()); + queryWrapper.last("limit 1"); - ReconciliationInvoiceDO reconciliationInvoiceDO = reconciliationInvoiceMapper.selectOne(queryWrapper); - reconciliationInvoiceDO.deleteById(); - } + ReconciliationInvoiceDO reconciliationInvoiceDO = reconciliationInvoiceMapper.selectOne(queryWrapper); + reconciliationInvoiceDO.deleteById(); + } } 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 682ba42..06fa4ff 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 @@ -26,37 +26,37 @@ import java.util.List; @Repository @RequiredArgsConstructor public class ReconciliationPaymentGatewayImpl implements ReconciliationPaymentGateway { - private final ReconciliationPaymentMapper reconciliationPaymentMapper; - private final ReconciliationPaymentConvert reconciliationPaymentConvert; + private final ReconciliationPaymentMapper reconciliationPaymentMapper; + private final ReconciliationPaymentConvert reconciliationPaymentConvert; - @Override - public ReconciliationPayment save(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd) { - ReconciliationPaymentDO reconciliationPaymentDO = reconciliationPaymentConvert.toReconciliationPaymentDO(reconciliationPaymentCreateCmd); - reconciliationPaymentMapper.insert(reconciliationPaymentDO); + @Override + public ReconciliationPayment save(ReconciliationPaymentCreateCmd reconciliationPaymentCreateCmd) { + ReconciliationPaymentDO reconciliationPaymentDO = reconciliationPaymentConvert.toReconciliationPaymentDO(reconciliationPaymentCreateCmd); + reconciliationPaymentMapper.insert(reconciliationPaymentDO); - return reconciliationPaymentConvert.toReconciliationPayment(reconciliationPaymentDO); - } + return reconciliationPaymentConvert.toReconciliationPayment(reconciliationPaymentDO); + } - @Override - public IPage page(ReconciliationPaymentPageQry reconciliationPaymentPageQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); + @Override + public IPage page(ReconciliationPaymentPageQry reconciliationPaymentPageQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); queryWrapper.orderByDesc(ReconciliationPaymentDO::getCreatedAt); - IPage page = new Page<>(reconciliationPaymentPageQry.getPageIndex(), reconciliationPaymentPageQry.getPageSize()); - page = reconciliationPaymentMapper.selectPage(page, queryWrapper); + IPage page = new Page<>(reconciliationPaymentPageQry.getPageIndex(), reconciliationPaymentPageQry.getPageSize()); + page = reconciliationPaymentMapper.selectPage(page, queryWrapper); - return page.convert(reconciliationPaymentConvert::toReconciliationPayment); - } + return page.convert(reconciliationPaymentConvert::toReconciliationPayment); + } - @Override - public List list(ReconciliationPaymentListQry reconciliationPaymentListQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); + @Override + public List list(ReconciliationPaymentListQry reconciliationPaymentListQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); List reconciliationPaymentDOList = reconciliationPaymentMapper.selectList(queryWrapper); - return reconciliationPaymentDOList.stream().map(reconciliationPaymentConvert::toReconciliationPayment).toList(); - } + return reconciliationPaymentDOList.stream().map(reconciliationPaymentConvert::toReconciliationPayment).toList(); + } - @Override - public ReconciliationPayment update(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd) { + @Override + public ReconciliationPayment update(ReconciliationPaymentUpdateCmd reconciliationPaymentUpdateCmd) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); queryWrapper.eq(ReconciliationPaymentDO::getReconciliationPaymentId, reconciliationPaymentUpdateCmd.getReconciliationPaymentId()); queryWrapper.last("limit 1"); @@ -66,27 +66,27 @@ public class ReconciliationPaymentGatewayImpl implements ReconciliationPaymentGa reconciliationPaymentConvert.toReconciliationPaymentDO(reconciliationPaymentDO, reconciliationPaymentUpdateCmd); reconciliationPaymentMapper.updateById(reconciliationPaymentDO); - return reconciliationPaymentConvert.toReconciliationPayment(reconciliationPaymentDO); - } + return reconciliationPaymentConvert.toReconciliationPayment(reconciliationPaymentDO); + } - @Override - public ReconciliationPayment show(ReconciliationPaymentShowQry reconciliationPaymentShowQry) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); - queryWrapper.eq(ReconciliationPaymentDO::getReconciliationPaymentId, reconciliationPaymentShowQry.getReconciliationPaymentId()); - queryWrapper.last("limit 1"); + @Override + public ReconciliationPayment show(ReconciliationPaymentShowQry reconciliationPaymentShowQry) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); + queryWrapper.eq(ReconciliationPaymentDO::getReconciliationPaymentId, reconciliationPaymentShowQry.getReconciliationPaymentId()); + queryWrapper.last("limit 1"); - ReconciliationPaymentDO reconciliationPaymentDO = reconciliationPaymentMapper.selectOne(queryWrapper); - return reconciliationPaymentConvert.toReconciliationPayment(reconciliationPaymentDO); - } + ReconciliationPaymentDO reconciliationPaymentDO = reconciliationPaymentMapper.selectOne(queryWrapper); + return reconciliationPaymentConvert.toReconciliationPayment(reconciliationPaymentDO); + } - @Override - public void destroy(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); - queryWrapper.eq(ReconciliationPaymentDO::getReconciliationPaymentId, reconciliationPaymentDestroyCmd.getReconciliationPaymentId()); - queryWrapper.last("limit 1"); + @Override + public void destroy(ReconciliationPaymentDestroyCmd reconciliationPaymentDestroyCmd) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReconciliationPaymentDO.class); + queryWrapper.eq(ReconciliationPaymentDO::getReconciliationPaymentId, reconciliationPaymentDestroyCmd.getReconciliationPaymentId()); + queryWrapper.last("limit 1"); - ReconciliationPaymentDO reconciliationPaymentDO = reconciliationPaymentMapper.selectOne(queryWrapper); - reconciliationPaymentDO.deleteById(); - } + ReconciliationPaymentDO reconciliationPaymentDO = reconciliationPaymentMapper.selectOne(queryWrapper); + reconciliationPaymentDO.deleteById(); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderMapper.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderMapper.java index a49e067..25cf2bb 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderMapper.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderMapper.java @@ -20,11 +20,12 @@ import java.util.Set; public interface OrderMapper extends BaseMapper { List selectByOrderIdList(@Param("orderIdList") Set orderIdList); + OrderDO selectByOrderId(@Param("orderId") Long orderId); IPage selectPage(IPage page, @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper, @Param("query") OrderPageQry orderPageQry); - List selectByQueryList(@Param(Constants.WRAPPER)LambdaQueryWrapper queryWrapper, @Param("query") OrderListQry orderListQry); + List selectByQueryList(@Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper, @Param("query") OrderListQry orderListQry); List selectByReconciliationIdList(@Param("reconciliationIdList") Set reconciliationIdList); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderSupplierMapper.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderSupplierMapper.java index 5eedb23..023434a 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderSupplierMapper.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderSupplierMapper.java @@ -18,6 +18,6 @@ import java.util.List; public interface OrderSupplierMapper extends BaseMapper { IPage selectPage(IPage page, @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper, @Param("query") OrderSupplierPageQry orderSupplierPageQry); - List selectByPaymentTaskId(Long paymentTaskId); + List selectByPaymentTaskId(Long paymentTaskId); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/ProductMapper.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/ProductMapper.java index a12556b..abe780e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/ProductMapper.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/ProductMapper.java @@ -6,18 +6,16 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; -import java.util.List; - /** * @author shenyifei */ @Mapper public interface ProductMapper extends BaseMapper { - /** - * 批量重置排序 - * - * @param productId 产品ID - */ - @Update("UPDATE product SET sort = (product_id * 1000) WHERE product_id = #{productId}") - void batchResetSort(@Param("productId") Long productId); -} \ No newline at end of file + /** + * 批量重置排序 + * + * @param productId 产品ID + */ + @Update("UPDATE product SET sort = (product_id * 1000) WHERE product_id = #{productId}") + void batchResetSort(@Param("productId") Long productId); +} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/SupplierInvoiceMapper.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/SupplierInvoiceMapper.java index 2773f0f..f4f3874 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/SupplierInvoiceMapper.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/SupplierInvoiceMapper.java @@ -11,9 +11,10 @@ import org.apache.ibatis.annotations.Param; /** * 发票记录表Mapper + * * @author shenyifei */ @Mapper public interface SupplierInvoiceMapper extends BaseMapper { - IPage selectPage(IPage page, @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper, @Param("query") SupplierInvoicePageQry supplierInvoicePageQry); + IPage selectPage(IPage page, @Param(Constants.WRAPPER) LambdaQueryWrapper queryWrapper, @Param("query") SupplierInvoicePageQry supplierInvoicePageQry); } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/util/SerialNumberGenerator.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/util/SerialNumberGenerator.java index fb94a03..8e98cc3 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/util/SerialNumberGenerator.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/util/SerialNumberGenerator.java @@ -13,122 +13,122 @@ import java.time.format.DateTimeFormatter; */ public class SerialNumberGenerator { - /** - * 日期格式化器 - 基本格式（YYYYMMDD） - */ - private static final DateTimeFormatter BASIC_DATE_FORMATTER = DateTimeFormatter.BASIC_ISO_DATE; + /** + * 日期格式化器 - 基本格式（YYYYMMDD） + */ + private static final DateTimeFormatter BASIC_DATE_FORMATTER = DateTimeFormatter.BASIC_ISO_DATE; - /** - * 默认序号位数 - */ - private static final int DEFAULT_SEQUENCE_DIGITS = 3; + /** + * 默认序号位数 + */ + private static final int DEFAULT_SEQUENCE_DIGITS = 3; - /** - * 默认序号范围（0-999） - */ - private static final int MAX_SEQUENCE = 1000; + /** + * 默认序号范围（0-999） + */ + private static final int MAX_SEQUENCE = 1000; - /** - * 私有构造函数，防止实例化 - */ - private SerialNumberGenerator() { - throw new UnsupportedOperationException("Utility class cannot be instantiated"); - } + /** + * 私有构造函数，防止实例化 + */ + private SerialNumberGenerator() { + throw new UnsupportedOperationException("Utility class cannot be instantiated"); + } - /** - * 生成编号（不带前缀） - *

- * 格式：YYYYMMDD + 序号(3位) - * 例如：20250113001 - * - * @return 编号字符串 - */ - public static String generate() { - return generate(null, DEFAULT_SEQUENCE_DIGITS); - } + /** + * 生成编号（不带前缀） + *

+ * 格式：YYYYMMDD + 序号(3位) + * 例如：20250113001 + * + * @return 编号字符串 + */ + public static String generate() { + return generate(null, DEFAULT_SEQUENCE_DIGITS); + } - /** - * 生成编号（带前缀） - *

- * 格式：前缀 + YYYYMMDD + 序号(3位) - * 例如：DZ20250113001 - * - * @param prefix 编号前缀（可为空） - * @return 编号字符串 - */ - public static String generate(String prefix) { - return generate(prefix, DEFAULT_SEQUENCE_DIGITS); - } + /** + * 生成编号（带前缀） + *

+ * 格式：前缀 + YYYYMMDD + 序号(3位) + * 例如：DZ20250113001 + * + * @param prefix 编号前缀（可为空） + * @return 编号字符串 + */ + public static String generate(String prefix) { + return generate(prefix, DEFAULT_SEQUENCE_DIGITS); + } - /** - * 生成编号（自定义序号位数） - *

- * 格式：前缀 + YYYYMMDD + 序号 - * 例如：DZ20250113001（3位序号）、DZ20250113000001（5位序号） - * - * @param prefix 编号前缀（可为空） - * @param sequenceDigits 序号位数 - * @return 编号字符串 - */ - public static String generate(String prefix, int sequenceDigits) { - String datePart = LocalDate.now().format(BASIC_DATE_FORMATTER); - int sequence = (int) (System.currentTimeMillis() % getMaxSequence(sequenceDigits)); - String sequencePart = String.format("%0" + sequenceDigits + "d", sequence); + /** + * 生成编号（自定义序号位数） + *

+ * 格式：前缀 + YYYYMMDD + 序号 + * 例如：DZ20250113001（3位序号）、DZ20250113000001（5位序号） + * + * @param prefix 编号前缀（可为空） + * @param sequenceDigits 序号位数 + * @return 编号字符串 + */ + public static String generate(String prefix, int sequenceDigits) { + String datePart = LocalDate.now().format(BASIC_DATE_FORMATTER); + int sequence = (int) (System.currentTimeMillis() % getMaxSequence(sequenceDigits)); + String sequencePart = String.format("%0" + sequenceDigits + "d", sequence); - StringBuilder sb = new StringBuilder(); - if (prefix != null && !prefix.isEmpty()) { - sb.append(prefix); - } - sb.append(datePart).append(sequencePart); + StringBuilder sb = new StringBuilder(); + if (prefix != null && !prefix.isEmpty()) { + sb.append(prefix); + } + sb.append(datePart).append(sequencePart); - return sb.toString(); - } + return sb.toString(); + } - /** - * 生成日期部分（YYYYMMDD） - * - * @return 日期字符串 - */ - public static String generateDatePart() { - return LocalDate.now().format(BASIC_DATE_FORMATTER); - } + /** + * 生成日期部分（YYYYMMDD） + * + * @return 日期字符串 + */ + public static String generateDatePart() { + return LocalDate.now().format(BASIC_DATE_FORMATTER); + } - /** - * 生成序号部分 - * - * @param digits 序号位数 - * @return 序号字符串 - */ - public static String generateSequencePart(int digits) { - int sequence = (int) (System.currentTimeMillis() % getMaxSequence(digits)); - return String.format("%0" + digits + "d", sequence); - } + /** + * 生成序号部分 + * + * @param digits 序号位数 + * @return 序号字符串 + */ + public static String generateSequencePart(int digits) { + int sequence = (int) (System.currentTimeMillis() % getMaxSequence(digits)); + return String.format("%0" + digits + "d", sequence); + } - /** - * 获取指定位数的最大序号 - * - * @param digits 序号位数 - * @return 最大序号（10的digits次方） - */ - private static int getMaxSequence(int digits) { - if (digits <= 0) { - throw new IllegalArgumentException("Sequence digits must be positive"); - } - if (digits > 9) { - throw new IllegalArgumentException("Sequence digits cannot exceed 9"); - } - return (int) Math.pow(10, digits); - } + /** + * 获取指定位数的最大序号 + * + * @param digits 序号位数 + * @return 最大序号（10的digits次方） + */ + private static int getMaxSequence(int digits) { + if (digits <= 0) { + throw new IllegalArgumentException("Sequence digits must be positive"); + } + if (digits > 9) { + throw new IllegalArgumentException("Sequence digits cannot exceed 9"); + } + return (int) Math.pow(10, digits); + } - /** - * 生成编号（使用当前时间戳的低3位作为序号） - *

- * 与旧代码兼容的方法，生成格式：YYYYMMDD + 3位序号 - * - * @return 编号字符串 - */ - public static String generateLegacy() { - return LocalDate.now().format(BASIC_DATE_FORMATTER) - + String.format("%03d", System.currentTimeMillis() % MAX_SEQUENCE); - } + /** + * 生成编号（使用当前时间戳的低3位作为序号） + *

+ * 与旧代码兼容的方法，生成格式：YYYYMMDD + 3位序号 + * + * @return 编号字符串 + */ + public static String generateLegacy() { + return LocalDate.now().format(BASIC_DATE_FORMATTER) + + String.format("%03d", System.currentTimeMillis() % MAX_SEQUENCE); + } } diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/application.yml b/erp-turbo-business/erp-turbo-biz/src/main/resources/application.yml index 6d4e22b..0ceb87a 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/application.yml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/application.yml @@ -6,9 +6,5 @@ spring: config: import: classpath:cache.yml,classpath:datasource.yml,classpath:rpc.yml,classpath:sa-token.yml -logging: - level: - com.xunhong.erp.turbo.third.mapper: debug - server: port: 8089 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/AuditMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/AuditMapper.xml index 3210526..f926265 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/AuditMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/AuditMapper.xml @@ -1,7 +1,9 @@ - + - + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/BoxSpecMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/BoxSpecMapper.xml index 4484521..052592f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/BoxSpecMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/BoxSpecMapper.xml @@ -1,7 +1,10 @@ - - - + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CostMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CostMapper.xml index ca0a9e8..1a3fb9e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CostMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CostMapper.xml @@ -1,7 +1,9 @@ - + - + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/DealerAccountRecordMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/DealerAccountRecordMapper.xml index f6fa5d0..22e115f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/DealerAccountRecordMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/DealerAccountRecordMapper.xml @@ -1,8 +1,12 @@ - - - - + + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseCostMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseCostMapper.xml index d0e8619..3cb7ee7 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseCostMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseCostMapper.xml @@ -1,7 +1,10 @@ - - - + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseProvisionMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseProvisionMapper.xml index 25208b0..efce1f9 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseProvisionMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseProvisionMapper.xml @@ -1,7 +1,10 @@ - - - + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseRecordMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseRecordMapper.xml index bfa8504..d7e2f4c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseRecordMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/ExpenseRecordMapper.xml @@ -1,7 +1,10 @@ - - - + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostItemMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostItemMapper.xml index af084ed..5576572 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostItemMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostItemMapper.xml @@ -1,7 +1,10 @@ - - - + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml index bbe2172..5695aad 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCostMapper.xml @@ -87,14 +87,15 @@ resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderCostDO" resultMap="SelectByOrderIdResultMap"> SELECT - oc.*, - po.state as po_state, - ov.vehicle_id, - ov.vehicle_no, - ov.dealer_id, - ov.dealer_name + oc.*, + po.state as po_state, + ov.vehicle_id, + ov.vehicle_no, + ov.dealer_id, + ov.dealer_name FROM order_cost oc - LEFT JOIN order_vehicle ov ON oc.order_id = ov.order_id AND ov.is_delete = 0 + LEFT JOIN order_vehicle ov ON oc.order_id = ov.order_id AND ov.is_delete + = 0 LEFT JOIN `order` po ON oc.order_id = po.order_id AND po.is_delete = 0 WHERE oc.order_id = #{orderId} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderMapper.xml index fd43346..6b4457e 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderMapper.xml @@ -169,7 +169,8 @@ po.is_delete = 0 - AND po.order_id IN (select order_id from reconciliation_item where + AND po.order_id IN (select order_id from reconciliation_item + where reconciliation_id in SELECT - ore.*, - po.state as po_state + ore.*, + po.state as po_state FROM order_rebate ore - LEFT JOIN order_vehicle ov ON ore.order_id = ov.order_id AND ov.is_delete = 0 + LEFT JOIN order_vehicle ov ON ore.order_id = ov.order_id AND + ov.is_delete = 0 LEFT JOIN `order` po ON ore.order_id = po.order_id AND po.is_delete = 0 ore.is_delete = 0 @@ -43,7 +44,8 @@ AND po.state IN - + #{state.type} 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 a9e8bc6..be0c236 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 @@ -67,10 +67,12 @@ resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderSupplierDO" resultMap="BaseResultMap"> SELECT - os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name, si.invoice_sn, si.invoice_img, si.registration_time, + os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name, + si.invoice_sn, si.invoice_img, si.registration_time, po.state as po_state FROM order_supplier os - LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id AND + LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id + AND si.is_delete = 0 LEFT JOIN order_vehicle ov ON os.order_id = ov.order_id AND ov.is_delete = 0 @@ -115,11 +117,14 @@ resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderSupplierDO" resultMap="BaseResultMap"> SELECT - os.*, si.supplier_invoice_id, si.supplier_id, si.supplier_name, si.invoice_sn, si.invoice_img, si.registration_time + os.*, si.supplier_invoice_id, si.supplier_id, si.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 AND + LEFT JOIN supplier_invoice si ON os.invoice_id = si.supplier_invoice_id + AND si.is_delete = 0 - LEFT JOIN payment_task_supplier pts ON os.order_supplier_id = pts.order_supplier_id AND pts.is_delete = 0 + LEFT JOIN payment_task_supplier pts ON os.order_supplier_id = + pts.order_supplier_id AND pts.is_delete = 0 WHERE pts.payment_task_id = #{paymentTaskId} diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskMapper.xml index 42e3351..3912c67 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskMapper.xml @@ -1,7 +1,10 @@ - - - + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskSupplierMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskSupplierMapper.xml index b5ba4df..e670e3f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskSupplierMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/PaymentTaskSupplierMapper.xml @@ -1,8 +1,12 @@ - - - - + + + + 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 95d379a..c9e0fcf 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 @@ -30,7 +30,8 @@ r.is_delete = 0 - AND r.order_id in (select order_id from reconciliation_item where order_id = #{query.orderId}) + AND r.order_id in (select order_id from reconciliation_item + where order_id = #{query.orderId}) 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 636ac17..34ee954 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 @@ -1,8 +1,12 @@ - - - - + + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierInvoiceMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierInvoiceMapper.xml index 27d7be8..aea093f 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierInvoiceMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/SupplierInvoiceMapper.xml @@ -33,13 +33,13 @@ si.is_delete = 0 AND si.supplier_invoice_id IN ( - SELECT invoice_id FROM order_supplier WHERE order_id IN ( - SELECT order_id FROM `order` WHERE state IN - - #{state.type} - - ) + SELECT invoice_id FROM order_supplier WHERE order_id IN ( + SELECT order_id FROM `order` WHERE state IN + + #{state.type} + + ) ) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/reconciliationInvoiceMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/reconciliationInvoiceMapper.xml index 49546eb..fa4d6d7 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/reconciliationInvoiceMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/reconciliationInvoiceMapper.xml @@ -1,8 +1,12 @@ - - - - + + + + diff --git a/erp-turbo-business/erp-turbo-facade/src/main/resources/application.yml b/erp-turbo-business/erp-turbo-facade/src/main/resources/application.yml index 6d4e22b..0ceb87a 100644 --- a/erp-turbo-business/erp-turbo-facade/src/main/resources/application.yml +++ b/erp-turbo-business/erp-turbo-facade/src/main/resources/application.yml @@ -6,9 +6,5 @@ spring: config: import: classpath:cache.yml,classpath:datasource.yml,classpath:rpc.yml,classpath:sa-token.yml -logging: - level: - com.xunhong.erp.turbo.third.mapper: debug - server: port: 8089 diff --git a/erp-turbo-business/erp-turbo-rbac/src/main/resources/mapper/MenuMapper.xml b/erp-turbo-business/erp-turbo-rbac/src/main/resources/mapper/MenuMapper.xml index 8e6a629..e6b3497 100644 --- a/erp-turbo-business/erp-turbo-rbac/src/main/resources/mapper/MenuMapper.xml +++ b/erp-turbo-business/erp-turbo-rbac/src/main/resources/mapper/MenuMapper.xml @@ -23,20 +23,22 @@ - + - UPDATE menu t - JOIN (SELECT menu_id, (ROW_NUMBER() OVER (ORDER BY sort) - 1) * 1000 AS new_sort - FROM menu WHERE menu_id = #{menuId} AND platform_id = #{platformId} + UPDATE menu t + JOIN (SELECT menu_id, (ROW_NUMBER() OVER (ORDER BY sort) - 1) * 1000 AS + new_sort + FROM menu WHERE menu_id = #{menuId} AND platform_id = #{platformId} AND pid = #{pid} AND pid IS NULL - ) AS sorted_rows - ON t.menu_id = sorted_rows.menu_id - SET t.sort = sorted_rows.new_sort WHERE t.menu_id = #{menuId} AND platform_id = #{platformId} + ) AS sorted_rows + ON t.menu_id = sorted_rows.menu_id + SET t.sort = sorted_rows.new_sort WHERE t.menu_id = #{menuId} AND + platform_id = #{platformId} AND pid = #{pid} @@ -44,4 +46,4 @@ AND pid IS NULL - \ No newline at end of file + diff --git a/erp-turbo-business/erp-turbo-user/src/main/java/com/xunhong/erp/turbo/user/app/service/EmployeeServiceImpl.java b/erp-turbo-business/erp-turbo-user/src/main/java/com/xunhong/erp/turbo/user/app/service/EmployeeServiceImpl.java index 57cd3ea..27214f5 100644 --- a/erp-turbo-business/erp-turbo-user/src/main/java/com/xunhong/erp/turbo/user/app/service/EmployeeServiceImpl.java +++ b/erp-turbo-business/erp-turbo-user/src/main/java/com/xunhong/erp/turbo/user/app/service/EmployeeServiceImpl.java @@ -1,4 +1,3 @@ - package com.xunhong.erp.turbo.user.app.service; import com.xunhong.erp.turbo.api.user.api.EmployeeServiceI; diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationInvoicePageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationInvoicePageQry.java index 483f2c0..4c23f85 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationInvoicePageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/ReconciliationInvoicePageQry.java @@ -5,6 +5,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDate; +import java.util.List; + /** * @author shenyifei */ @@ -13,7 +16,19 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class ReconciliationInvoicePageQry extends PageQuery { - @Schema(title = "对账发票ID", type = "string") - private Long reconciliationInvoiceId; + @Schema(title = "经销商ID", type = "string") + private Long dealerId; + + @Schema(title = "公司ID", type = "string") + private Long companyId; + + @Schema(title = "对账ID", type = "string") + private Long reconciliationId; + + @Schema(title = "发票日期", type = "string") + private List invoiceDate; + + @Schema(title = "发票编号", type = "string") + private String invoiceSn; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationInvoiceVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationInvoiceVO.java index 57b82bc..a3eb84c 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationInvoiceVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/ReconciliationInvoiceVO.java @@ -85,5 +85,14 @@ public class ReconciliationInvoiceVO extends DTO { @Schema(title = "创建时间") private LocalDateTime createdAt; + @Schema(title = "经销商信息") + private DealerVO dealerVO; + + @Schema(title = "公司信息") + private CompanyVO companyVO; + + @Schema(title = "经销商账户信息") + private DealerPaymentAccountVO dealerPaymentAccountVO; + }