From 41cefd5fd53aeb0f15d32f8211850ce3806f86d4 Mon Sep 17 00:00:00 2001 From: caojia <1301869380@qq.com> Date: Wed, 11 Nov 2026 00:18:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customermoney/CustomerBillController.java | 14 +-- .../ArBankAccountController.java | 6 +- .../{ar => receivable}/ArBillController.java | 31 ++++--- .../ArReceiptController.java | 7 +- .../controller/report/ArProfitController.java | 14 +-- .../ArBillExportDownloadTest.java | 0 .../bms/report/ArCommissionServiceTest.java | 16 ++-- .../com/bms/report/ArProfitMapperSqlTest.java | 10 +-- .../bms/report/ArProfitScopeResolverTest.java | 3 +- .../bms/report/CommissionCalculatorTest.java | 6 +- .../impl/CustomerMoneyServiceImpl.java | 4 +- .../service/impl/PrcOrderBillServiceImpl.java | 5 +- .../config/ArBillExportTaskConfig.java | 2 +- .../domain/ArBalanceWriteoff.java | 2 +- .../domain/ArBankAccount.java | 2 +- .../bms/{ar => receivable}/domain/ArBill.java | 2 +- .../domain/ArBillDetail.java | 2 +- .../domain/ArBillDetailFee.java | 2 +- .../domain/ArBillExport.java | 2 +- .../domain/ArBillGenerateTask.java | 2 +- .../{ar => receivable}/domain/ArBillLog.java | 2 +- .../domain/ArExportTemplate.java | 2 +- .../domain/vo/ArBillActionRequest.java | 2 +- .../vo/ArBillGeneratePreviewExportRow.java | 2 +- .../domain/vo/ArBillGenerateQuery.java | 2 +- .../domain/vo/ArBillGenerateRequest.java | 4 +- .../domain/vo/ArBillListExportRow.java | 6 +- .../domain/vo/ArBillQuery.java | 4 +- .../domain/vo/ArBillSummary.java | 2 +- .../enums/ArBalanceWriteoffStatus.java | 2 +- .../enums/ArBillDateType.java | 2 +- .../enums/ArBillGenerateTaskStatus.java | 2 +- .../enums/ArBillGenerationStatus.java | 2 +- .../enums/ArBillSelectionMode.java | 2 +- .../enums/ArBillStatus.java | 2 +- .../enums/ArExportStatus.java | 2 +- .../enums/ArIncomeBillFeeStatus.java | 2 +- .../enums/ArLogObjectType.java | 2 +- .../enums/ArLogOperationSource.java | 2 +- .../enums/ArLogOperationType.java | 2 +- .../{ar => receivable}/enums/ArLogResult.java | 2 +- .../enums/ArOrderBillStatus.java | 2 +- .../event/ArBillExportTaskEvent.java | 2 +- .../event/ArBillGenerateTaskEvent.java | 2 +- .../mapper/ArBalanceWriteoffMapper.java | 6 +- .../mapper/ArBankAccountMapper.java | 4 +- .../mapper/ArBillDetailFeeMapper.java | 6 +- .../mapper/ArBillDetailMapper.java | 6 +- .../mapper/ArBillExportMapper.java | 4 +- .../mapper/ArBillGenerateTaskMapper.java | 6 +- .../mapper/ArBillLogMapper.java | 6 +- .../mapper/ArBillMapper.java | 10 +-- .../mapper/ArBillScopeMapper.java | 4 +- .../mapper/ArCommissionMapper.java | 12 +-- .../mapper/ArExportTemplateMapper.java | 4 +- .../mapper/ArProfitMapper.java | 16 ++-- .../profit/ArCommissionRate.java | 2 +- .../profit/ArCommissionResult.java | 2 +- .../profit/ArCommissionService.java | 16 ++-- .../profit/ArCommissionSummary.java | 2 +- .../profit/ArProfitQuery.java | 2 +- .../profit/ArProfitRow.java | 2 +- .../profit/ArProfitSalesOption.java | 2 +- .../profit/ArProfitScope.java | 2 +- .../profit/ArProfitScopeResolver.java | 4 +- .../profit/ArProfitService.java | 8 +- .../profit/ArProfitSummary.java | 2 +- .../profit/ArWriteoffRate.java | 2 +- .../profit/CommissionCalculator.java | 2 +- .../security/ArBillRoleKeys.java | 2 +- .../security/ArBillRowScope.java | 2 +- .../security/ArBillScopeResolver.java | 4 +- .../service/IArBalanceWriteoffService.java | 6 +- .../service/IArBillLogService.java | 8 +- .../service/IArBillService.java | 26 +++--- .../impl/ArBalanceWriteoffServiceImpl.java | 32 +++---- .../service/impl/ArBillLogServiceImpl.java | 18 ++-- .../service/impl/ArBillServiceImpl.java | 80 +++++++++--------- .../task/ArBillExportTaskRunner.java | 6 +- .../task/ArBillGenerateTaskRunner.java | 8 +- .../ArBalanceWriteoffMapper.xml | 2 +- .../ArBankAccountMapper.xml | 0 .../ArBillDetailFeeMapper.xml | 2 +- .../{ar => receivable}/ArBillDetailMapper.xml | 2 +- .../{ar => receivable}/ArBillExportMapper.xml | 0 .../ArBillGenerateTaskMapper.xml | 2 +- .../{ar => receivable}/ArBillLogMapper.xml | 2 +- .../{ar => receivable}/ArBillMapper.xml | 8 +- .../{ar => receivable}/ArBillScopeMapper.xml | 2 +- .../{ar => receivable}/ArCommissionMapper.xml | 14 +-- .../ArExportTemplateMapper.xml | 0 .../{ar => receivable}/ArProfitMapper.xml | 10 +-- .../{ar => receivable}/ar_bill_template.xlsx | Bin 93 files changed, 276 insertions(+), 280 deletions(-) rename bms-back/bms-admin/src/main/java/com/bms/web/controller/{ar => receivable}/ArBankAccountController.java (88%) rename bms-back/bms-admin/src/main/java/com/bms/web/controller/{ar => receivable}/ArBillController.java (95%) rename bms-back/bms-admin/src/main/java/com/bms/web/controller/{ar => receivable}/ArReceiptController.java (97%) rename bms-back/bms-admin/src/test/java/com/bms/{ar => receivable}/ArBillExportDownloadTest.java (100%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/config/ArBillExportTaskConfig.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBalanceWriteoff.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBankAccount.java (95%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBill.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBillDetail.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBillDetailFee.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBillExport.java (97%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBillGenerateTask.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArBillLog.java (97%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/ArExportTemplate.java (94%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/vo/ArBillActionRequest.java (80%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/vo/ArBillGeneratePreviewExportRow.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/vo/ArBillGenerateQuery.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/vo/ArBillGenerateRequest.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/vo/ArBillListExportRow.java (94%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/vo/ArBillQuery.java (90%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/domain/vo/ArBillSummary.java (91%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArBalanceWriteoffStatus.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArBillDateType.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArBillGenerateTaskStatus.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArBillGenerationStatus.java (93%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArBillSelectionMode.java (97%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArBillStatus.java (97%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArExportStatus.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArIncomeBillFeeStatus.java (90%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArLogObjectType.java (94%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArLogOperationSource.java (95%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArLogOperationType.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArLogResult.java (95%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/enums/ArOrderBillStatus.java (90%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/event/ArBillExportTaskEvent.java (92%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/event/ArBillGenerateTaskEvent.java (92%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBalanceWriteoffMapper.java (90%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBankAccountMapper.java (85%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBillDetailFeeMapper.java (85%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBillDetailMapper.java (88%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBillExportMapper.java (88%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBillGenerateTaskMapper.java (91%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBillLogMapper.java (75%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBillMapper.java (91%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArBillScopeMapper.java (88%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArCommissionMapper.java (85%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArExportTemplateMapper.java (80%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/mapper/ArProfitMapper.java (62%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArCommissionRate.java (94%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArCommissionResult.java (97%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArCommissionService.java (94%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArCommissionSummary.java (89%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArProfitQuery.java (92%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArProfitRow.java (97%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArProfitSalesOption.java (80%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArProfitScope.java (92%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArProfitScopeResolver.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArProfitService.java (90%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArProfitSummary.java (92%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/ArWriteoffRate.java (93%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/profit/CommissionCalculator.java (99%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/security/ArBillRoleKeys.java (96%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/security/ArBillRowScope.java (95%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/security/ArBillScopeResolver.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/service/IArBalanceWriteoffService.java (86%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/service/IArBillLogService.java (67%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/service/IArBillService.java (79%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/service/impl/ArBalanceWriteoffServiceImpl.java (94%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/service/impl/ArBillLogServiceImpl.java (80%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/service/impl/ArBillServiceImpl.java (98%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/task/ArBillExportTaskRunner.java (94%) rename bms-back/bms-system/src/main/java/com/bms/{ar => receivable}/task/ArBillGenerateTaskRunner.java (95%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBalanceWriteoffMapper.xml (98%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBankAccountMapper.xml (100%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBillDetailFeeMapper.xml (98%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBillDetailMapper.xml (99%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBillExportMapper.xml (100%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBillGenerateTaskMapper.xml (98%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBillLogMapper.xml (98%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBillMapper.xml (96%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArBillScopeMapper.xml (96%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArCommissionMapper.xml (95%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArExportTemplateMapper.xml (100%) rename bms-back/bms-system/src/main/resources/mapper/{ar => receivable}/ArProfitMapper.xml (96%) rename bms-back/bms-system/src/main/resources/templates/{ar => receivable}/ar_bill_template.xlsx (100%) diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerBillController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerBillController.java index 9d9ccb4b..ccac100e 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerBillController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/customer/customermoney/CustomerBillController.java @@ -13,13 +13,13 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bms.ar.domain.ArBill; -import com.bms.ar.domain.ArBalanceWriteoff; -import com.bms.ar.domain.vo.ArBillListExportRow; -import com.bms.ar.domain.vo.ArBillQuery; -import com.bms.ar.domain.vo.ArBillSummary; -import com.bms.ar.service.IArBalanceWriteoffService; -import com.bms.ar.service.IArBillService; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.domain.ArBalanceWriteoff; +import com.bms.receivable.domain.vo.ArBillListExportRow; +import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.domain.vo.ArBillSummary; +import com.bms.receivable.service.IArBalanceWriteoffService; +import com.bms.receivable.service.IArBillService; import com.bms.common.annotation.Log; import com.bms.common.core.controller.BaseController; import com.bms.common.core.domain.AjaxResult; diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBankAccountController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBankAccountController.java similarity index 88% rename from bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBankAccountController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBankAccountController.java index ce8b99bd..5e5e8470 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBankAccountController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBankAccountController.java @@ -1,4 +1,4 @@ -package com.bms.web.controller.ar; +package com.bms.web.controller.receivable; import java.util.List; @@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.bms.ar.domain.ArBankAccount; -import com.bms.ar.service.IArBillService; +import com.bms.receivable.domain.ArBankAccount; +import com.bms.receivable.service.IArBillService; import com.bms.common.core.controller.BaseController; import com.bms.common.core.domain.AjaxResult; diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java similarity index 95% rename from bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java index 0bd01d70..fbb853d2 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArBillController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArBillController.java @@ -1,4 +1,4 @@ -package com.bms.web.controller.ar; +package com.bms.web.controller.receivable; import java.util.ArrayList; import java.util.List; @@ -23,21 +23,20 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import com.bms.ar.domain.ArBill; -import com.bms.ar.domain.ArBankAccount; -import com.bms.ar.domain.ArBillDetailFee; -import com.bms.ar.domain.ArBillExport; -import com.bms.ar.domain.ArBillGenerateTask; -import com.bms.ar.domain.ArBillLog; -import com.bms.ar.domain.vo.ArBillActionRequest; -import com.bms.ar.domain.vo.ArBillGenerateQuery; -import com.bms.ar.domain.vo.ArBillGeneratePreviewExportRow; -import com.bms.ar.domain.vo.ArBillGenerateRequest; -import com.bms.ar.domain.vo.ArBillListExportRow; -import com.bms.ar.domain.vo.ArBillQuery; -import com.bms.ar.enums.ArBillDateType; -import com.bms.ar.service.IArBillService; -import com.bms.ar.security.ArBillScopeResolver; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.domain.ArBankAccount; +import com.bms.receivable.domain.ArBillDetailFee; +import com.bms.receivable.domain.ArBillGenerateTask; +import com.bms.receivable.domain.ArBillLog; +import com.bms.receivable.domain.vo.ArBillActionRequest; +import com.bms.receivable.domain.vo.ArBillGenerateQuery; +import com.bms.receivable.domain.vo.ArBillGeneratePreviewExportRow; +import com.bms.receivable.domain.vo.ArBillGenerateRequest; +import com.bms.receivable.domain.vo.ArBillListExportRow; +import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.enums.ArBillDateType; +import com.bms.receivable.service.IArBillService; +import com.bms.receivable.security.ArBillScopeResolver; import com.bms.common.annotation.Log; import com.bms.common.core.controller.BaseController; import com.bms.common.core.domain.AjaxResult; diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArReceiptController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArReceiptController.java similarity index 97% rename from bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArReceiptController.java rename to bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArReceiptController.java index 5e0cc246..44ef54a3 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/ar/ArReceiptController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/receivable/ArReceiptController.java @@ -1,4 +1,4 @@ -package com.bms.web.controller.ar; +package com.bms.web.controller.receivable; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -12,9 +12,8 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bms.ar.domain.ArBalanceWriteoff; -import com.bms.ar.domain.ArBill; -import com.bms.ar.service.IArBalanceWriteoffService; +import com.bms.receivable.domain.ArBalanceWriteoff; +import com.bms.receivable.service.IArBalanceWriteoffService; import com.bms.common.annotation.Log; import com.bms.common.core.controller.BaseController; import com.bms.common.core.domain.AjaxResult; diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/ArProfitController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/ArProfitController.java index a23c3977..7a4f4c78 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/ArProfitController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/report/ArProfitController.java @@ -6,16 +6,16 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.bms.ar.profit.ArCommissionRate; -import com.bms.ar.profit.ArCommissionService; -import com.bms.ar.profit.ArProfitQuery; -import com.bms.ar.profit.ArProfitService; -import com.bms.ar.profit.ArWriteoffRate; +import com.bms.receivable.profit.ArCommissionRate; +import com.bms.receivable.profit.ArCommissionService; +import com.bms.receivable.profit.ArProfitQuery; +import com.bms.receivable.profit.ArProfitService; +import com.bms.receivable.profit.ArWriteoffRate; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.PathVariable; import jakarta.servlet.http.HttpServletResponse; -import com.bms.ar.profit.ArProfitRow; -import com.bms.ar.profit.ArCommissionResult; +import com.bms.receivable.profit.ArProfitRow; +import com.bms.receivable.profit.ArCommissionResult; import com.bms.common.utils.poi.ExcelUtil; import com.bms.price.enums.ProfitAreaRule; import com.bms.common.annotation.Log; diff --git a/bms-back/bms-admin/src/test/java/com/bms/ar/ArBillExportDownloadTest.java b/bms-back/bms-admin/src/test/java/com/bms/receivable/ArBillExportDownloadTest.java similarity index 100% rename from bms-back/bms-admin/src/test/java/com/bms/ar/ArBillExportDownloadTest.java rename to bms-back/bms-admin/src/test/java/com/bms/receivable/ArBillExportDownloadTest.java diff --git a/bms-back/bms-admin/src/test/java/com/bms/report/ArCommissionServiceTest.java b/bms-back/bms-admin/src/test/java/com/bms/report/ArCommissionServiceTest.java index 1fa6ffaf..a7bb20a1 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/report/ArCommissionServiceTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/report/ArCommissionServiceTest.java @@ -11,14 +11,14 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; -import com.bms.ar.domain.ArBalanceWriteoff; -import com.bms.ar.domain.ArBill; -import com.bms.ar.mapper.ArCommissionMapper; -import com.bms.ar.profit.ArCommissionRate; -import com.bms.ar.profit.ArCommissionResult; -import com.bms.ar.profit.ArCommissionService; -import com.bms.ar.profit.ArProfitScope; -import com.bms.ar.profit.ArProfitScopeResolver; +import com.bms.receivable.domain.ArBalanceWriteoff; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.mapper.ArCommissionMapper; +import com.bms.receivable.profit.ArCommissionRate; +import com.bms.receivable.profit.ArCommissionResult; +import com.bms.receivable.profit.ArCommissionService; +import com.bms.receivable.profit.ArProfitScope; +import com.bms.receivable.profit.ArProfitScopeResolver; import com.bms.common.exception.ServiceException; class ArCommissionServiceTest diff --git a/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java b/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java index f40d5c05..ff422aae 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitMapperSqlTest.java @@ -8,9 +8,9 @@ import java.util.Map; import org.apache.ibatis.builder.xml.XMLMapperBuilder; import org.apache.ibatis.session.Configuration; import org.junit.jupiter.api.Test; -import com.bms.ar.profit.ArProfitQuery; -import com.bms.ar.profit.ArProfitScope; -import com.bms.ar.profit.ArCommissionResult; +import com.bms.receivable.profit.ArProfitQuery; +import com.bms.receivable.profit.ArProfitScope; +import com.bms.receivable.profit.ArCommissionResult; class ArProfitMapperSqlTest { @@ -18,7 +18,7 @@ class ArProfitMapperSqlTest void commissionInReportSummaryUsesBillFiltersAndDataScope() throws Exception { Configuration configuration = new Configuration(); - String resource = "mapper/ar/ArProfitMapper.xml"; + String resource = "mapper/receivable/ArProfitMapper.xml"; try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource)) { new XMLMapperBuilder(input, configuration, resource, configuration.getSqlFragments()).parse(); @@ -65,7 +65,7 @@ class ArProfitMapperSqlTest { Configuration configuration = new Configuration(); // 提成 Mapper 先加载时也必须能解析引用的报表权限片段。 - for (String resource : new String[] { "mapper/ar/ArCommissionMapper.xml", "mapper/ar/ArProfitMapper.xml" }) + for (String resource : new String[] {"mapper/receivable/ArCommissionMapper.xml", "mapper/receivable/ArProfitMapper.xml"}) { try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource)) { diff --git a/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitScopeResolverTest.java b/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitScopeResolverTest.java index d2ae3faf..a2a736ec 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitScopeResolverTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/report/ArProfitScopeResolverTest.java @@ -4,10 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import com.bms.ar.profit.ArProfitScopeResolver; +import com.bms.receivable.profit.ArProfitScopeResolver; import com.bms.common.core.domain.entity.SysRole; import com.bms.common.core.domain.entity.SysUser; import com.bms.common.core.domain.model.LoginUser; diff --git a/bms-back/bms-admin/src/test/java/com/bms/report/CommissionCalculatorTest.java b/bms-back/bms-admin/src/test/java/com/bms/report/CommissionCalculatorTest.java index 75e997e0..f3daabb9 100644 --- a/bms-back/bms-admin/src/test/java/com/bms/report/CommissionCalculatorTest.java +++ b/bms-back/bms-admin/src/test/java/com/bms/report/CommissionCalculatorTest.java @@ -6,9 +6,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import java.math.BigDecimal; import java.util.List; -import com.bms.ar.profit.CommissionCalculator; -import com.bms.ar.profit.ArCommissionResult; -import com.bms.ar.profit.CommissionCalculator.Writeoff; +import com.bms.receivable.profit.CommissionCalculator; +import com.bms.receivable.profit.ArCommissionResult; +import com.bms.receivable.profit.CommissionCalculator.Writeoff; import org.junit.jupiter.api.Test; class CommissionCalculatorTest diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java index 3437ef1a..c8ef355c 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java @@ -15,8 +15,8 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import com.bms.common.exception.ServiceException; import com.bms.common.utils.SecurityUtils; -import com.bms.ar.domain.ArBankAccount; -import com.bms.ar.mapper.ArBankAccountMapper; +import com.bms.receivable.domain.ArBankAccount; +import com.bms.receivable.mapper.ArBankAccountMapper; import com.bms.customer.customerinfo.domain.BmsCustomer; import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java index 8f4c3238..be598462 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java @@ -6,7 +6,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collections; import java.util.Arrays; import java.util.Date; import java.util.HashSet; @@ -28,8 +27,8 @@ import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.bms.ar.enums.ArIncomeBillFeeStatus; -import com.bms.ar.enums.ArOrderBillStatus; +import com.bms.receivable.enums.ArIncomeBillFeeStatus; +import com.bms.receivable.enums.ArOrderBillStatus; import com.bms.common.annotation.DataScope; import com.bms.common.core.domain.entity.SysUser; import com.bms.common.exception.ServiceException; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/config/ArBillExportTaskConfig.java b/bms-back/bms-system/src/main/java/com/bms/receivable/config/ArBillExportTaskConfig.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/config/ArBillExportTaskConfig.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/config/ArBillExportTaskConfig.java index 704bd650..1848c1c0 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/config/ArBillExportTaskConfig.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/config/ArBillExportTaskConfig.java @@ -1,4 +1,4 @@ -package com.bms.ar.config; +package com.bms.receivable.config; import java.util.concurrent.ThreadPoolExecutor; import org.springframework.context.annotation.Bean; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBalanceWriteoff.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBalanceWriteoff.java index b9f0f1ac..7683221a 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBalanceWriteoff.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.math.BigDecimal; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBankAccount.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBankAccount.java similarity index 95% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBankAccount.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBankAccount.java index 0fd69fe4..645f9024 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBankAccount.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBankAccount.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBill.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBill.java index 9c1895b6..d62508b2 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBill.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.math.BigDecimal; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java index 0140aab1..15dedf01 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetailFee.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetailFee.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java index ca8f69ea..e0d0240e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetailFee.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillExport.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillExport.java similarity index 97% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillExport.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillExport.java index 12a77dfd..9e8ada8e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillExport.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillExport.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillGenerateTask.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillGenerateTask.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java index 00833fcf..a76fab07 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillGenerateTask.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillLog.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillLog.java similarity index 97% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillLog.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillLog.java index c58c1570..730e448d 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillLog.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillLog.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArExportTemplate.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArExportTemplate.java similarity index 94% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/ArExportTemplate.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArExportTemplate.java index 237bcdd0..bcadfa22 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/ArExportTemplate.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArExportTemplate.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain; +package com.bms.receivable.domain; import java.io.Serializable; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillActionRequest.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillActionRequest.java similarity index 80% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillActionRequest.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillActionRequest.java index 35f5fe6d..947649be 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillActionRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillActionRequest.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain.vo; +package com.bms.receivable.domain.vo; import lombok.Data; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGeneratePreviewExportRow.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGeneratePreviewExportRow.java index 4f2dab18..295f937e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGeneratePreviewExportRow.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain.vo; +package com.bms.receivable.domain.vo; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateQuery.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateQuery.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateQuery.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateQuery.java index ceda9d17..995d9233 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateQuery.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain.vo; +package com.bms.receivable.domain.vo; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateRequest.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateRequest.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateRequest.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateRequest.java index 106c21ca..3d0a0ee7 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateRequest.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateRequest.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain.vo; +package com.bms.receivable.domain.vo; import java.util.Date; import java.util.List; @@ -8,7 +8,7 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import com.bms.common.config.serializer.StrictDateDeserializer; -import com.bms.ar.enums.ArBillSelectionMode; +import com.bms.receivable.enums.ArBillSelectionMode; import lombok.Data; /** 从订单计费结果生成正式账单的参数。 */ diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillListExportRow.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillListExportRow.java similarity index 94% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillListExportRow.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillListExportRow.java index 5c156e73..328f6969 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillListExportRow.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillListExportRow.java @@ -1,11 +1,11 @@ -package com.bms.ar.domain.vo; +package com.bms.receivable.domain.vo; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import com.bms.ar.domain.ArBill; -import com.bms.ar.enums.ArBillStatus; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.enums.ArBillStatus; import com.bms.common.annotation.Excel; import lombok.Data; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillQuery.java similarity index 90% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillQuery.java index 70d4ff43..8f738454 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillQuery.java @@ -1,9 +1,9 @@ -package com.bms.ar.domain.vo; +package com.bms.receivable.domain.vo; import java.util.Date; import java.util.List; import org.springframework.format.annotation.DateTimeFormat; -import com.bms.ar.domain.ArBill; +import com.bms.receivable.domain.ArBill; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillSummary.java b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillSummary.java similarity index 91% rename from bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillSummary.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillSummary.java index 0c76a186..40b2fe28 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillSummary.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillSummary.java @@ -1,4 +1,4 @@ -package com.bms.ar.domain.vo; +package com.bms.receivable.domain.vo; import java.io.Serializable; import java.math.BigDecimal; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBalanceWriteoffStatus.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBalanceWriteoffStatus.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBalanceWriteoffStatus.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBalanceWriteoffStatus.java index d0bfc9ab..bc2ecb33 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBalanceWriteoffStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBalanceWriteoffStatus.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** * 应收账单余额核销单状态。 diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillDateType.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillDateType.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillDateType.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillDateType.java index cd522945..6cdeecbd 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillDateType.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillDateType.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收账单生成时用于截止日筛选的来源订单日期字段。 */ public enum ArBillDateType diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerateTaskStatus.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerateTaskStatus.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerateTaskStatus.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerateTaskStatus.java index 2088908f..7c012f70 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerateTaskStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerateTaskStatus.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收账单异步生成任务状态。 */ public final class ArBillGenerateTaskStatus diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerationStatus.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerationStatus.java similarity index 93% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerationStatus.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerationStatus.java index e8513d17..8a4ecf4e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerationStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerationStatus.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收账单生成状态，与账单业务状态分离。 */ public final class ArBillGenerationStatus diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillSelectionMode.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillSelectionMode.java similarity index 97% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillSelectionMode.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillSelectionMode.java index fb4dc3d7..8e473bec 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillSelectionMode.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillSelectionMode.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** * 应收账单生成时的订单选择模式。 diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillStatus.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillStatus.java similarity index 97% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillStatus.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillStatus.java index 08b59d3b..b599aa74 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillStatus.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收账单状态。数据库保存值使用 code，避免业务代码散落状态字符串。 */ public enum ArBillStatus diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArExportStatus.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArExportStatus.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArExportStatus.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArExportStatus.java index f25f5973..1d9dc160 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArExportStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArExportStatus.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** * 应收账单导出任务状态。 diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArIncomeBillFeeStatus.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArIncomeBillFeeStatus.java similarity index 90% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArIncomeBillFeeStatus.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArIncomeBillFeeStatus.java index 65710904..66c24ee5 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArIncomeBillFeeStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArIncomeBillFeeStatus.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收费用明细是否已经生成正式应收账单。 */ public enum ArIncomeBillFeeStatus diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogObjectType.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogObjectType.java similarity index 94% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogObjectType.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogObjectType.java index a4e899d5..6342e09a 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogObjectType.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogObjectType.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收日志关联对象类型。 */ public enum ArLogObjectType diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationSource.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationSource.java similarity index 95% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationSource.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationSource.java index e5ae2830..5a4aac73 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationSource.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationSource.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收日志操作来源。 */ public enum ArLogOperationSource diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationType.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationType.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationType.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationType.java index cd84e3d1..f1d08155 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationType.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationType.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收日志操作类型。 */ public enum ArLogOperationType diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogResult.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogResult.java similarity index 95% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogResult.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogResult.java index 7d61a1b3..09e729e3 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogResult.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogResult.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 应收操作日志结果。 */ public enum ArLogResult diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArOrderBillStatus.java b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArOrderBillStatus.java similarity index 90% rename from bms-back/bms-system/src/main/java/com/bms/ar/enums/ArOrderBillStatus.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArOrderBillStatus.java index 3d881d95..761c767d 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/enums/ArOrderBillStatus.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArOrderBillStatus.java @@ -1,4 +1,4 @@ -package com.bms.ar.enums; +package com.bms.receivable.enums; /** 计费订单的应收账单状态。 */ public enum ArOrderBillStatus diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillExportTaskEvent.java b/bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillExportTaskEvent.java similarity index 92% rename from bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillExportTaskEvent.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillExportTaskEvent.java index d9c17dc9..18b06024 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillExportTaskEvent.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillExportTaskEvent.java @@ -1,4 +1,4 @@ -package com.bms.ar.event; +package com.bms.receivable.event; /** * 应收账单导出任务已提交事件。 diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillGenerateTaskEvent.java b/bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillGenerateTaskEvent.java similarity index 92% rename from bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillGenerateTaskEvent.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillGenerateTaskEvent.java index 0f72a8f5..103bd043 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillGenerateTaskEvent.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillGenerateTaskEvent.java @@ -1,4 +1,4 @@ -package com.bms.ar.event; +package com.bms.receivable.event; /** * 应收账单异步生成任务已提交事件。 diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBalanceWriteoffMapper.java similarity index 90% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBalanceWriteoffMapper.java index 3f97cca2..152892d4 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBalanceWriteoffMapper.java @@ -1,10 +1,10 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.List; -import com.bms.ar.security.ArBillRowScope; +import com.bms.receivable.security.ArBillRowScope; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBalanceWriteoff; +import com.bms.receivable.domain.ArBalanceWriteoff; /** * 应收账单余额核销 Mapper diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBankAccountMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBankAccountMapper.java similarity index 85% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBankAccountMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBankAccountMapper.java index 9fc77e6c..1df7bf4c 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBankAccountMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBankAccountMapper.java @@ -1,9 +1,9 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBankAccount; +import com.bms.receivable.domain.ArBankAccount; public interface ArBankAccountMapper { ArBankAccount selectDefaultByCurrency(@Param("currency") String currency); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailFeeMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailFeeMapper.java similarity index 85% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailFeeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailFeeMapper.java index 5c75df9c..bdb513c4 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailFeeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailFeeMapper.java @@ -1,10 +1,10 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.List; -import com.bms.ar.security.ArBillRowScope; +import com.bms.receivable.security.ArBillRowScope; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBillDetailFee; +import com.bms.receivable.domain.ArBillDetailFee; public interface ArBillDetailFeeMapper { List selectByBillIdAndDetailIdScoped(@Param("arBillId") Long arBillId, @Param("detailId") Long detailId, @Param("scope") ArBillRowScope scope); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java similarity index 88% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java index 15ccdfa9..f361e703 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java @@ -1,12 +1,12 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.List; -import com.bms.ar.security.ArBillRowScope; +import com.bms.receivable.security.ArBillRowScope; import java.util.Map; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBillDetail; +import com.bms.receivable.domain.ArBillDetail; public interface ArBillDetailMapper { List selectByBillIdScoped(@Param("arBillId") Long arBillId, @Param("scope") ArBillRowScope scope); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillExportMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillExportMapper.java similarity index 88% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillExportMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillExportMapper.java index 959725b7..3b4e74ee 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillExportMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillExportMapper.java @@ -1,10 +1,10 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBillExport; +import com.bms.receivable.domain.ArBillExport; public interface ArBillExportMapper { List selectByBillId(Long arBillId); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillGenerateTaskMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java similarity index 91% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillGenerateTaskMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java index b0c398ea..4facb2ca 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillGenerateTaskMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java @@ -1,17 +1,17 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBillGenerateTask; +import com.bms.receivable.domain.ArBillGenerateTask; /** * 应收账单异步生成任务 Mapper。 */ public interface ArBillGenerateTaskMapper { List selectActiveByCreateByScoped(@Param("createBy") String createBy, - @Param("scope") com.bms.ar.security.ArBillRowScope scope); + @Param("scope") com.bms.receivable.security.ArBillRowScope scope); ArBillGenerateTask selectById(Long taskId); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillLogMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillLogMapper.java similarity index 75% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillLogMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillLogMapper.java index 01c569bf..279cbea4 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillLogMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillLogMapper.java @@ -1,10 +1,10 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.List; -import com.bms.ar.security.ArBillRowScope; +import com.bms.receivable.security.ArBillRowScope; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBillLog; +import com.bms.receivable.domain.ArBillLog; public interface ArBillLogMapper { diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillMapper.java similarity index 91% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillMapper.java index 2c1bd595..fdbe8aec 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillMapper.java @@ -1,14 +1,14 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.bms.ar.security.ArBillRowScope; +import com.bms.receivable.security.ArBillRowScope; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArBill; -import com.bms.ar.domain.vo.ArBillQuery; -import com.bms.ar.domain.vo.ArBillSummary; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.domain.vo.ArBillSummary; public interface ArBillMapper { List selectArBillList(@Param("query") ArBillQuery query, @Param("scope") ArBillRowScope scope); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillScopeMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillScopeMapper.java similarity index 88% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillScopeMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillScopeMapper.java index 15cc7490..b2ecc664 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillScopeMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillScopeMapper.java @@ -1,8 +1,8 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.bms.ar.security.ArBillRowScope; +import com.bms.receivable.security.ArBillRowScope; import com.bms.customer.customerinfo.domain.BmsCustomerOption; public interface ArBillScopeMapper { diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArCommissionMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArCommissionMapper.java similarity index 85% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArCommissionMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArCommissionMapper.java index 1a77e51e..b261411a 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArCommissionMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArCommissionMapper.java @@ -1,13 +1,13 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.bms.ar.profit.ArCommissionRate; -import com.bms.ar.profit.ArWriteoffRate; -import com.bms.ar.profit.ArCommissionResult; -import com.bms.ar.profit.ArCommissionSummary; -import com.bms.ar.profit.ArProfitScope; +import com.bms.receivable.profit.ArCommissionRate; +import com.bms.receivable.profit.ArWriteoffRate; +import com.bms.receivable.profit.ArCommissionResult; +import com.bms.receivable.profit.ArCommissionSummary; +import com.bms.receivable.profit.ArProfitScope; public interface ArCommissionMapper { diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArExportTemplateMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArExportTemplateMapper.java similarity index 80% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArExportTemplateMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArExportTemplateMapper.java index 55d79fb9..2e70a0d9 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArExportTemplateMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArExportTemplateMapper.java @@ -1,9 +1,9 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.Date; import org.apache.ibatis.annotations.Param; -import com.bms.ar.domain.ArExportTemplate; +import com.bms.receivable.domain.ArExportTemplate; public interface ArExportTemplateMapper { /** diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArProfitMapper.java b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArProfitMapper.java similarity index 62% rename from bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArProfitMapper.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArProfitMapper.java index 069b6823..8bb39799 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArProfitMapper.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArProfitMapper.java @@ -1,14 +1,14 @@ -package com.bms.ar.mapper; +package com.bms.receivable.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.bms.ar.profit.ArProfitQuery; -import com.bms.ar.profit.ArProfitRow; -import com.bms.ar.profit.ArProfitScope; -import com.bms.ar.profit.ArProfitSummary; -import com.bms.ar.profit.ArProfitSalesOption; -import com.bms.ar.domain.ArBillDetailFee; -import com.bms.ar.domain.ArBillDetail; +import com.bms.receivable.profit.ArProfitQuery; +import com.bms.receivable.profit.ArProfitRow; +import com.bms.receivable.profit.ArProfitScope; +import com.bms.receivable.profit.ArProfitSummary; +import com.bms.receivable.profit.ArProfitSalesOption; +import com.bms.receivable.domain.ArBillDetailFee; +import com.bms.receivable.domain.ArBillDetail; public interface ArProfitMapper { diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionRate.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionRate.java similarity index 94% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionRate.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionRate.java index da8d48ba..253cd790 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionRate.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionRate.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionResult.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionResult.java similarity index 97% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionResult.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionResult.java index ce732fa4..43f28a5f 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionResult.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionResult.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionService.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionService.java similarity index 94% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionService.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionService.java index 3447c988..e6b9200c 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionService.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionService.java @@ -1,17 +1,17 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import java.util.Date; import java.util.List; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.bms.ar.domain.ArBalanceWriteoff; -import com.bms.ar.domain.ArBill; -import com.bms.ar.mapper.ArCommissionMapper; -import com.bms.ar.mapper.ArBillMapper; -import com.bms.ar.enums.ArBillStatus; -import com.bms.ar.enums.ArBillGenerationStatus; -import com.bms.ar.security.ArBillRoleKeys; +import com.bms.receivable.domain.ArBalanceWriteoff; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.mapper.ArCommissionMapper; +import com.bms.receivable.mapper.ArBillMapper; +import com.bms.receivable.enums.ArBillStatus; +import com.bms.receivable.enums.ArBillGenerationStatus; +import com.bms.receivable.security.ArBillRoleKeys; import com.bms.common.exception.ServiceException; import com.bms.common.core.domain.entity.SysUser; import com.bms.common.utils.SecurityUtils; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionSummary.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionSummary.java similarity index 89% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionSummary.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionSummary.java index 31063205..532cb5e2 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionSummary.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionSummary.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import lombok.Data; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitQuery.java similarity index 92% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitQuery.java index 358cdf8e..f795eab1 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitQuery.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.util.Date; import lombok.Data; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitRow.java similarity index 97% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitRow.java index a95aaa22..c0363d6f 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitRow.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSalesOption.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSalesOption.java similarity index 80% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSalesOption.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSalesOption.java index 0ff4a874..9aa76025 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSalesOption.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSalesOption.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import lombok.Data; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScope.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScope.java similarity index 92% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScope.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScope.java index 24d52b1d..3b4c336b 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScope.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScope.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; /** 后端构造的数据范围，不接收前端传入的权限参数。 */ public record ArProfitScope(boolean all, boolean self, boolean department, Long userId, Long deptId) diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScopeResolver.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScopeResolver.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScopeResolver.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScopeResolver.java index a2290c27..52542d5d 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScopeResolver.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScopeResolver.java @@ -1,9 +1,9 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.util.Arrays; import java.util.Set; import org.springframework.stereotype.Component; -import com.bms.ar.security.ArBillRoleKeys; +import com.bms.receivable.security.ArBillRoleKeys; import com.bms.common.constant.Constants; import com.bms.common.core.domain.entity.SysRole; import com.bms.common.core.domain.entity.SysUser; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitService.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitService.java similarity index 90% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitService.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitService.java index b14df719..53c5ddfb 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitService.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitService.java @@ -1,10 +1,10 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.util.List; import org.springframework.stereotype.Service; -import com.bms.ar.mapper.ArProfitMapper; -import com.bms.ar.domain.ArBillDetailFee; -import com.bms.ar.domain.ArBillDetail; +import com.bms.receivable.mapper.ArProfitMapper; +import com.bms.receivable.domain.ArBillDetailFee; +import com.bms.receivable.domain.ArBillDetail; @Service public class ArProfitService diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSummary.java similarity index 92% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSummary.java index 54c10e1f..1908ec1e 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSummary.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import lombok.Data; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArWriteoffRate.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArWriteoffRate.java similarity index 93% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/ArWriteoffRate.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArWriteoffRate.java index cdd49689..ba599500 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/ArWriteoffRate.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArWriteoffRate.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import java.util.Date; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/profit/CommissionCalculator.java b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/CommissionCalculator.java similarity index 99% rename from bms-back/bms-system/src/main/java/com/bms/ar/profit/CommissionCalculator.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/profit/CommissionCalculator.java index c693d320..10e9c92f 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/profit/CommissionCalculator.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/profit/CommissionCalculator.java @@ -1,4 +1,4 @@ -package com.bms.ar.profit; +package com.bms.receivable.profit; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRoleKeys.java b/bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRoleKeys.java similarity index 96% rename from bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRoleKeys.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRoleKeys.java index 850d1427..079ea2f0 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRoleKeys.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRoleKeys.java @@ -1,4 +1,4 @@ -package com.bms.ar.security; +package com.bms.receivable.security; import java.util.Set; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRowScope.java b/bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRowScope.java similarity index 95% rename from bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRowScope.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRowScope.java index 38eec00b..cb27a14a 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRowScope.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRowScope.java @@ -1,4 +1,4 @@ -package com.bms.ar.security; +package com.bms.receivable.security; /** 仅由后端构造，不能绑定到 HTTP 查询对象。 */ public final class ArBillRowScope { diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillScopeResolver.java b/bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillScopeResolver.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillScopeResolver.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillScopeResolver.java index 6bf5c4ab..1e00f09d 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillScopeResolver.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillScopeResolver.java @@ -1,4 +1,4 @@ -package com.bms.ar.security; +package com.bms.receivable.security; import java.util.Arrays; import java.util.List; @@ -7,7 +7,7 @@ import java.util.function.Supplier; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import org.springframework.stereotype.Component; -import com.bms.ar.mapper.ArBillScopeMapper; +import com.bms.receivable.mapper.ArBillScopeMapper; import com.bms.common.constant.Constants; import com.bms.common.core.domain.entity.SysRole; import com.bms.common.core.domain.entity.SysUser; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBalanceWriteoffService.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBalanceWriteoffService.java similarity index 86% rename from bms-back/bms-system/src/main/java/com/bms/ar/service/IArBalanceWriteoffService.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBalanceWriteoffService.java index 471d70f1..7ff8f5c4 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBalanceWriteoffService.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBalanceWriteoffService.java @@ -1,8 +1,8 @@ -package com.bms.ar.service; +package com.bms.receivable.service; import java.util.List; -import com.bms.ar.domain.ArBalanceWriteoff; -import com.bms.ar.domain.ArBill; +import com.bms.receivable.domain.ArBalanceWriteoff; +import com.bms.receivable.domain.ArBill; /** * 应收账单余额核销 Service接口 diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillLogService.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillLogService.java similarity index 67% rename from bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillLogService.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillLogService.java index 32b07ccf..8a889b65 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillLogService.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillLogService.java @@ -1,10 +1,10 @@ -package com.bms.ar.service; +package com.bms.receivable.service; import java.util.List; -import com.bms.ar.domain.ArBillLog; -import com.bms.ar.enums.ArLogObjectType; -import com.bms.ar.enums.ArLogOperationType; +import com.bms.receivable.domain.ArBillLog; +import com.bms.receivable.enums.ArLogObjectType; +import com.bms.receivable.enums.ArLogOperationType; public interface IArBillLogService { List selectLogList(ArBillLog query); diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillService.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java similarity index 79% rename from bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillService.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java index 609cc1dd..c59eefed 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillService.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java @@ -1,20 +1,20 @@ -package com.bms.ar.service; +package com.bms.receivable.service; import java.math.BigDecimal; import java.util.Date; import java.util.List; -import com.bms.ar.domain.ArBill; -import com.bms.ar.domain.ArBankAccount; -import com.bms.ar.domain.ArBillDetail; -import com.bms.ar.domain.ArBillDetailFee; -import com.bms.ar.domain.ArBillExport; -import com.bms.ar.domain.ArBillGenerateTask; -import com.bms.ar.domain.ArBillLog; -import com.bms.ar.domain.vo.ArBillGenerateRequest; -import com.bms.ar.domain.vo.ArBillGenerateQuery; -import com.bms.ar.domain.vo.ArBillActionRequest; -import com.bms.ar.domain.vo.ArBillQuery; -import com.bms.ar.domain.vo.ArBillSummary; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.domain.ArBankAccount; +import com.bms.receivable.domain.ArBillDetail; +import com.bms.receivable.domain.ArBillDetailFee; +import com.bms.receivable.domain.ArBillExport; +import com.bms.receivable.domain.ArBillGenerateTask; +import com.bms.receivable.domain.ArBillLog; +import com.bms.receivable.domain.vo.ArBillGenerateRequest; +import com.bms.receivable.domain.vo.ArBillGenerateQuery; +import com.bms.receivable.domain.vo.ArBillActionRequest; +import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.domain.vo.ArBillSummary; import com.bms.price.domain.PrcOrderBill; /** diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBalanceWriteoffServiceImpl.java similarity index 94% rename from bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBalanceWriteoffServiceImpl.java index ef8b676c..7adb7581 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBalanceWriteoffServiceImpl.java @@ -1,4 +1,4 @@ -package com.bms.ar.service.impl; +package com.bms.receivable.service.impl; import java.math.BigDecimal; import java.math.RoundingMode; @@ -12,21 +12,21 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import com.bms.ar.domain.ArBalanceWriteoff; -import com.bms.ar.domain.ArBill; -import com.bms.ar.domain.ArBillLog; -import com.bms.ar.enums.ArBalanceWriteoffStatus; -import com.bms.ar.enums.ArBillStatus; -import com.bms.ar.enums.ArLogObjectType; -import com.bms.ar.enums.ArLogOperationSource; -import com.bms.ar.enums.ArLogOperationType; -import com.bms.ar.enums.ArLogResult; -import com.bms.ar.mapper.ArBalanceWriteoffMapper; -import com.bms.ar.mapper.ArBillMapper; -import com.bms.ar.security.ArBillScopeResolver; -import com.bms.ar.profit.ArCommissionService; -import com.bms.ar.service.IArBalanceWriteoffService; -import com.bms.ar.service.IArBillLogService; +import com.bms.receivable.domain.ArBalanceWriteoff; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.domain.ArBillLog; +import com.bms.receivable.enums.ArBalanceWriteoffStatus; +import com.bms.receivable.enums.ArBillStatus; +import com.bms.receivable.enums.ArLogObjectType; +import com.bms.receivable.enums.ArLogOperationSource; +import com.bms.receivable.enums.ArLogOperationType; +import com.bms.receivable.enums.ArLogResult; +import com.bms.receivable.mapper.ArBalanceWriteoffMapper; +import com.bms.receivable.mapper.ArBillMapper; +import com.bms.receivable.security.ArBillScopeResolver; +import com.bms.receivable.profit.ArCommissionService; +import com.bms.receivable.service.IArBalanceWriteoffService; +import com.bms.receivable.service.IArBillLogService; import com.bms.common.exception.ServiceException; import com.bms.common.utils.SecurityUtils; import com.bms.customer.customermoney.domain.CustomerReceipt; diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillLogServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillLogServiceImpl.java similarity index 80% rename from bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillLogServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillLogServiceImpl.java index 4231daa2..056e57d5 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillLogServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillLogServiceImpl.java @@ -1,4 +1,4 @@ -package com.bms.ar.service.impl; +package com.bms.receivable.service.impl; import java.util.List; @@ -6,14 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import com.bms.ar.domain.ArBillLog; -import com.bms.ar.enums.ArLogObjectType; -import com.bms.ar.enums.ArLogOperationSource; -import com.bms.ar.enums.ArLogOperationType; -import com.bms.ar.enums.ArLogResult; -import com.bms.ar.mapper.ArBillLogMapper; -import com.bms.ar.security.ArBillScopeResolver; -import com.bms.ar.service.IArBillLogService; +import com.bms.receivable.domain.ArBillLog; +import com.bms.receivable.enums.ArLogObjectType; +import com.bms.receivable.enums.ArLogOperationSource; +import com.bms.receivable.enums.ArLogOperationType; +import com.bms.receivable.enums.ArLogResult; +import com.bms.receivable.mapper.ArBillLogMapper; +import com.bms.receivable.security.ArBillScopeResolver; +import com.bms.receivable.service.IArBillLogService; import com.bms.common.utils.uuid.IdUtils; @Service diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java similarity index 98% rename from bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java index f3e3b846..f4dac739 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java @@ -1,4 +1,4 @@ -package com.bms.ar.service.impl; +package com.bms.receivable.service.impl; import java.io.File; import java.io.IOException; @@ -44,49 +44,49 @@ import org.springframework.transaction.support.TransactionTemplate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; -import com.bms.ar.domain.ArBill; -import com.bms.ar.domain.ArBankAccount; -import com.bms.ar.domain.ArBillDetail; -import com.bms.ar.domain.ArBillDetailFee; -import com.bms.ar.domain.ArBillExport; -import com.bms.ar.domain.ArBillGenerateTask; -import com.bms.ar.domain.ArBillLog; -import com.bms.ar.domain.ArExportTemplate; -import com.bms.ar.event.ArBillExportTaskEvent; -import com.bms.ar.event.ArBillGenerateTaskEvent; -import com.bms.ar.enums.ArBillGenerateTaskStatus; -import com.bms.ar.enums.ArBillDateType; -import com.bms.ar.enums.ArBillGenerationStatus; -import com.bms.ar.enums.ArBillSelectionMode; -import com.bms.ar.enums.ArBillStatus; -import com.bms.ar.enums.ArExportStatus; -import com.bms.ar.enums.ArIncomeBillFeeStatus; -import com.bms.ar.enums.ArLogObjectType; -import com.bms.ar.enums.ArLogOperationSource; -import com.bms.ar.enums.ArLogOperationType; -import com.bms.ar.enums.ArLogResult; -import com.bms.ar.enums.ArOrderBillStatus; -import com.bms.ar.mapper.ArBillDetailFeeMapper; -import com.bms.ar.mapper.ArBillDetailMapper; -import com.bms.ar.mapper.ArBillExportMapper; -import com.bms.ar.mapper.ArBillLogMapper; -import com.bms.ar.mapper.ArBillMapper; -import com.bms.ar.security.ArBillScopeResolver; +import com.bms.receivable.domain.ArBill; +import com.bms.receivable.domain.ArBankAccount; +import com.bms.receivable.domain.ArBillDetail; +import com.bms.receivable.domain.ArBillDetailFee; +import com.bms.receivable.domain.ArBillExport; +import com.bms.receivable.domain.ArBillGenerateTask; +import com.bms.receivable.domain.ArBillLog; +import com.bms.receivable.domain.ArExportTemplate; +import com.bms.receivable.event.ArBillExportTaskEvent; +import com.bms.receivable.event.ArBillGenerateTaskEvent; +import com.bms.receivable.enums.ArBillGenerateTaskStatus; +import com.bms.receivable.enums.ArBillDateType; +import com.bms.receivable.enums.ArBillGenerationStatus; +import com.bms.receivable.enums.ArBillSelectionMode; +import com.bms.receivable.enums.ArBillStatus; +import com.bms.receivable.enums.ArExportStatus; +import com.bms.receivable.enums.ArIncomeBillFeeStatus; +import com.bms.receivable.enums.ArLogObjectType; +import com.bms.receivable.enums.ArLogOperationSource; +import com.bms.receivable.enums.ArLogOperationType; +import com.bms.receivable.enums.ArLogResult; +import com.bms.receivable.enums.ArOrderBillStatus; +import com.bms.receivable.mapper.ArBillDetailFeeMapper; +import com.bms.receivable.mapper.ArBillDetailMapper; +import com.bms.receivable.mapper.ArBillExportMapper; +import com.bms.receivable.mapper.ArBillLogMapper; +import com.bms.receivable.mapper.ArBillMapper; +import com.bms.receivable.security.ArBillScopeResolver; import com.bms.customer.customerinfo.domain.BmsCustomerOption; import com.bms.customer.customerinfo.domain.BmsCustomer; import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; import com.bms.common.core.domain.entity.SysUser; import com.bms.system.mapper.SysUserMapper; -import com.bms.ar.mapper.ArBillGenerateTaskMapper; -import com.bms.ar.mapper.ArBankAccountMapper; -import com.bms.ar.mapper.ArExportTemplateMapper; -import com.bms.ar.service.IArBillLogService; -import com.bms.ar.service.IArBillService; -import com.bms.ar.domain.vo.ArBillActionRequest; -import com.bms.ar.domain.vo.ArBillGenerateQuery; -import com.bms.ar.domain.vo.ArBillGenerateRequest; -import com.bms.ar.domain.vo.ArBillQuery; -import com.bms.ar.domain.vo.ArBillSummary; +import com.bms.receivable.mapper.ArBillGenerateTaskMapper; +import com.bms.receivable.mapper.ArBankAccountMapper; +import com.bms.receivable.mapper.ArExportTemplateMapper; +import com.bms.receivable.service.IArBillLogService; +import com.bms.receivable.service.IArBillService; +import com.bms.receivable.domain.vo.ArBillActionRequest; +import com.bms.receivable.domain.vo.ArBillGenerateQuery; +import com.bms.receivable.domain.vo.ArBillGenerateRequest; +import com.bms.receivable.domain.vo.ArBillQuery; +import com.bms.receivable.domain.vo.ArBillSummary; import com.bms.common.config.BmsConfig; import com.bms.common.exception.ServiceException; import com.bms.common.utils.DateUtils; @@ -116,7 +116,7 @@ public class ArBillServiceImpl implements IArBillService { private static final Logger log = LoggerFactory.getLogger(ArBillServiceImpl.class); private static final String EXPORT_TEMPLATE_BUSINESS_TYPE = "AR_BILL"; - private static final String EXPORT_TEMPLATE_RESOURCE = "templates/ar/ar_bill_template.xlsx"; + private static final String EXPORT_TEMPLATE_RESOURCE = "templates/receivable/ar_bill_template.xlsx"; /** * Excel 行号从 1 开始；模板第 4 行是表头，明细从第 5 行开始写入。 */ diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillExportTaskRunner.java b/bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillExportTaskRunner.java similarity index 94% rename from bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillExportTaskRunner.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillExportTaskRunner.java index afab7a5f..9db52b88 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillExportTaskRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillExportTaskRunner.java @@ -1,4 +1,4 @@ -package com.bms.ar.task; +package com.bms.receivable.task; import java.util.Date; @@ -12,8 +12,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; -import com.bms.ar.event.ArBillExportTaskEvent; -import com.bms.ar.service.IArBillService; +import com.bms.receivable.event.ArBillExportTaskEvent; +import com.bms.receivable.service.IArBillService; /** * 应收账单导出异步任务执行器。 diff --git a/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillGenerateTaskRunner.java b/bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillGenerateTaskRunner.java similarity index 95% rename from bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillGenerateTaskRunner.java rename to bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillGenerateTaskRunner.java index bdbacf28..ee5a6f72 100644 --- a/bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillGenerateTaskRunner.java +++ b/bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillGenerateTaskRunner.java @@ -1,4 +1,4 @@ -package com.bms.ar.task; +package com.bms.receivable.task; import java.util.Date; @@ -12,9 +12,9 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionalEventListener; -import com.bms.ar.domain.ArBillGenerateTask; -import com.bms.ar.event.ArBillGenerateTaskEvent; -import com.bms.ar.service.IArBillService; +import com.bms.receivable.domain.ArBillGenerateTask; +import com.bms.receivable.event.ArBillGenerateTaskEvent; +import com.bms.receivable.service.IArBillService; /** * 应收账单异步生成任务调度器。 diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBalanceWriteoffMapper.xml similarity index 98% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBalanceWriteoffMapper.xml index 3ddd6c46..3fda56fa 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBalanceWriteoffMapper.xml @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and date_format(w.writeoff_date,'%y%m%d') <= date_format(#{query.params.endTime},'%y%m%d') - + order by w.create_time desc, w.writeoff_id desc diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBankAccountMapper.xml similarity index 100% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBankAccountMapper.xml diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailFeeMapper.xml similarity index 98% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailFeeMapper.xml index 3866eeb9..d13bf23f 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailFeeMapper.xml @@ -102,7 +102,7 @@ inner join ar_bill_detail d on d.detail_id = f.detail_id where d.ar_bill_id = #{arBillId} and f.detail_id = #{detailId} - AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = d.ar_bill_id ) + AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = d.ar_bill_id ) order by f.fee_no, f.detail_fee_id diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml similarity index 99% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml index aeaded09..57881a69 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml @@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" product_code, product_name, goods_description, country_code, country_name, dest_postcode, actual_weight, receive_weight, volume_weight, charge_weight, freight_rate, registration_fee, pkg_length, pkg_width, pkg_height, currency, total_amount, product_amount, redline_amount, billing_fail_status, remark, create_by, create_time - from ar_bill_detail where ar_bill_id = #{arBillId} AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = ar_bill_detail.ar_bill_id ) + from ar_bill_detail where ar_bill_id = #{arBillId} AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = ar_bill_detail.ar_bill_id ) order by detail_no diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillExportMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillExportMapper.xml similarity index 100% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBillExportMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBillExportMapper.xml diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillGenerateTaskMapper.xml similarity index 98% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBillGenerateTaskMapper.xml index f86db5ff..e3fdac62 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillGenerateTaskMapper.xml @@ -74,7 +74,7 @@ where create_by = #{createBy} and status in ('WAITING', 'RUNNING', 'CANCEL_REQUESTED') AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = ar_bill_generate_task.ar_bill_id - ) + ) order by create_time desc, task_id desc diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillLogMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillLogMapper.xml similarity index 98% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBillLogMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBillLogMapper.xml index 1173f24d..b95d03a0 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillLogMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillLogMapper.xml @@ -51,7 +51,7 @@ and l.request_id = #{query.requestId} and l.result = #{query.result} - + order by l.create_time desc, l.log_id desc diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillMapper.xml similarity index 96% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBillMapper.xml index 4dd5533f..5e715549 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillMapper.xml @@ -39,7 +39,7 @@ - + @@ -106,7 +106,7 @@ and bill_date >= #{query.billDateStart} and bill_date <= #{query.billDateEnd} and bill_period_end = #{query.billPeriodEnd} - + @@ -132,7 +132,7 @@ diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillScopeMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillScopeMapper.xml similarity index 96% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArBillScopeMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArBillScopeMapper.xml index 90c88d43..53840dd0 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArBillScopeMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArBillScopeMapper.xml @@ -35,7 +35,7 @@ AND EXISTS (SELECT 1 FROM ctr_customer c WHERE c.customer_id = b.customer_id - + ) diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArCommissionMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArCommissionMapper.xml similarity index 95% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArCommissionMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArCommissionMapper.xml index 869e9086..981f1735 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArCommissionMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArCommissionMapper.xml @@ -1,13 +1,13 @@ - + - + @@ -16,7 +16,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -44,7 +44,7 @@ where sales_user_id = #{salesUserId} and effective_at <= #{at} order by effective_at desc, rate_id desc limit 1 for update - + insert into ar_profit_commission_rate(sales_user_id, rate, effective_at, create_by, create_time, remark) values(#{salesUserId}, #{rate}, #{effectiveAt}, #{createBy}, sysdate(), #{remark}) @@ -104,7 +104,7 @@ and r.result_status != 'REVERSED' and b.status = 'WRITTEN_OFF' and b.generation_status = 'READY' and r.ar_bill_id = #{billId} - + order by r.result_id desc diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArExportTemplateMapper.xml similarity index 100% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArExportTemplateMapper.xml diff --git a/bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml b/bms-back/bms-system/src/main/resources/mapper/receivable/ArProfitMapper.xml similarity index 96% rename from bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml rename to bms-back/bms-system/src/main/resources/mapper/receivable/ArProfitMapper.xml index 0bd971eb..504176ca 100644 --- a/bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/receivable/ArProfitMapper.xml @@ -1,7 +1,7 @@ - + @@ -13,19 +13,19 @@ - + - + - + @@ -133,7 +133,7 @@ ) commission on commission.currency = t.currency group by t.currency order by t.currency - select u.user_id as userId, u.nick_name as name, u.user_name as code from sys_user u where u.del_flag = '0' and u.status = '0' diff --git a/bms-back/bms-system/src/main/resources/templates/ar/ar_bill_template.xlsx b/bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx similarity index 100% rename from bms-back/bms-system/src/main/resources/templates/ar/ar_bill_template.xlsx rename to bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx