wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整命名

Browse Source
This commit is contained in:
caojia
2026-11-11 00:18:12 +08:00
parent fca999c384
commit 41cefd5fd5
93 changed files with 276 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-system/src/main/java/com/bms/customer/customermoney/service/impl/CustomerMoneyServiceImpl.java
+2 -2
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcOrderBillServiceImpl.java
+2 -3
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/config/ArBillExportTaskConfig.java → bms-back/bms-system/src/main/java/com/bms/receivable/config/ArBillExportTaskConfig.java
+1 -1
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBalanceWriteoff.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.math.BigDecimal;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBankAccount.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBankAccount.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.io.Serializable;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBill.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBill.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.math.BigDecimal;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetail.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetail.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.io.Serializable;
import java.math.BigDecimal;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillDetailFee.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillDetailFee.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.io.Serializable;
import java.math.BigDecimal;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillExport.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillExport.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.io.Serializable;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillGenerateTask.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillGenerateTask.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.io.Serializable;
import java.math.BigDecimal;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBillLog.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArBillLog.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.io.Serializable;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/domain/ArExportTemplate.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/ArExportTemplate.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain;
package com.bms.receivable.domain;
import java.io.Serializable;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillActionRequest.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillActionRequest.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo;
package com.bms.receivable.domain.vo;
import lombok.Data;
bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGeneratePreviewExportRow.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGeneratePreviewExportRow.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo;
package com.bms.receivable.domain.vo;
import java.io.Serializable;
import java.math.BigDecimal;
bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateQuery.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateQuery.java
+1 -1
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillGenerateRequest.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillGenerateRequest.java
+2 -2
View File
@@ -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;
/** 从订单计费结果生成正式账单的参数。 */
bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillListExportRow.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillListExportRow.java
+3 -3
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillQuery.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillQuery.java
+2 -2
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/domain/vo/ArBillSummary.java → bms-back/bms-system/src/main/java/com/bms/receivable/domain/vo/ArBillSummary.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo;
package com.bms.receivable.domain.vo;
import java.io.Serializable;
import java.math.BigDecimal;
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBalanceWriteoffStatus.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBalanceWriteoffStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/**
* 应收账单余额核销单状态。
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillDateType.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillDateType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收账单生成时用于截止日筛选的来源订单日期字段。 */
public enum ArBillDateType
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerateTaskStatus.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerateTaskStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收账单异步生成任务状态。 */
public final class ArBillGenerateTaskStatus
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillGenerationStatus.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillGenerationStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收账单生成状态，与账单业务状态分离。 */
public final class ArBillGenerationStatus
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillSelectionMode.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillSelectionMode.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/**
* 应收账单生成时的订单选择模式。
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArBillStatus.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArBillStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收账单状态。数据库保存值使用 code，避免业务代码散落状态字符串。 */
public enum ArBillStatus
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArExportStatus.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArExportStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/**
* 应收账单导出任务状态。
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArIncomeBillFeeStatus.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArIncomeBillFeeStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收费用明细是否已经生成正式应收账单。 */
public enum ArIncomeBillFeeStatus
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogObjectType.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogObjectType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收日志关联对象类型。 */
public enum ArLogObjectType
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationSource.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationSource.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收日志操作来源。 */
public enum ArLogOperationSource
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogOperationType.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogOperationType.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收日志操作类型。 */
public enum ArLogOperationType
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArLogResult.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArLogResult.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 应收操作日志结果。 */
public enum ArLogResult
bms-back/bms-system/src/main/java/com/bms/ar/enums/ArOrderBillStatus.java → bms-back/bms-system/src/main/java/com/bms/receivable/enums/ArOrderBillStatus.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.enums;
package com.bms.receivable.enums;
/** 计费订单的应收账单状态。 */
public enum ArOrderBillStatus
bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillExportTaskEvent.java → bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillExportTaskEvent.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.event;
package com.bms.receivable.event;
/**
* 应收账单导出任务已提交事件。
bms-back/bms-system/src/main/java/com/bms/ar/event/ArBillGenerateTaskEvent.java → bms-back/bms-system/src/main/java/com/bms/receivable/event/ArBillGenerateTaskEvent.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.event;
package com.bms.receivable.event;
/**
* 应收账单异步生成任务已提交事件。
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBalanceWriteoffMapper.java
+3 -3
View File
@@ -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
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBankAccountMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBankAccountMapper.java
+2 -2
View File
@@ -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);
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailFeeMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailFeeMapper.java
+3 -3
View File
@@ -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<ArBillDetailFee> selectByBillIdAndDetailIdScoped(@Param("arBillId") Long arBillId, @Param("detailId") Long detailId, @Param("scope") ArBillRowScope scope);
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillDetailMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillDetailMapper.java
+3 -3
View File
@@ -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<ArBillDetail> selectByBillIdScoped(@Param("arBillId") Long arBillId, @Param("scope") ArBillRowScope scope);
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillExportMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillExportMapper.java
+2 -2
View File
@@ -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<ArBillExport> selectByBillId(Long arBillId);
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillGenerateTaskMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillGenerateTaskMapper.java
+3 -3
View File
@@ -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<ArBillGenerateTask> 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);
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillLogMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillLogMapper.java
+3 -3
View File
@@ -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
{
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillMapper.java
+5 -5
View File
@@ -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<ArBill> selectArBillList(@Param("query") ArBillQuery query, @Param("scope") ArBillRowScope scope);
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBillScopeMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArBillScopeMapper.java
+2 -2
View File
@@ -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 {
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArCommissionMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArCommissionMapper.java
+6 -6
View File
@@ -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
{
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArExportTemplateMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArExportTemplateMapper.java
+2 -2
View File
@@ -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 {
/**
bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArProfitMapper.java → bms-back/bms-system/src/main/java/com/bms/receivable/mapper/ArProfitMapper.java
+8 -8
View File
@@ -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
{
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionRate.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionRate.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.math.BigDecimal;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionResult.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionResult.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.math.BigDecimal;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionService.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionService.java
+8 -8
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArCommissionSummary.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArCommissionSummary.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.math.BigDecimal;
import lombok.Data;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitQuery.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitQuery.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.util.Date;
import lombok.Data;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitRow.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitRow.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.math.BigDecimal;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSalesOption.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSalesOption.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import lombok.Data;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScope.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScope.java
+1 -1
View File
@@ -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)
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitScopeResolver.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitScopeResolver.java
+2 -2
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitService.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitService.java
+4 -4
View File
@@ -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
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArProfitSummary.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArProfitSummary.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.math.BigDecimal;
import lombok.Data;
bms-back/bms-system/src/main/java/com/bms/ar/profit/ArWriteoffRate.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/ArWriteoffRate.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.math.BigDecimal;
import java.util.Date;
bms-back/bms-system/src/main/java/com/bms/ar/profit/CommissionCalculator.java → bms-back/bms-system/src/main/java/com/bms/receivable/profit/CommissionCalculator.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.profit;
package com.bms.receivable.profit;
import java.math.BigDecimal;
import java.math.RoundingMode;
bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRoleKeys.java → bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRoleKeys.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.security;
package com.bms.receivable.security;
import java.util.Set;
bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillRowScope.java → bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillRowScope.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.bms.ar.security;
package com.bms.receivable.security;
/** 仅由后端构造，不能绑定到 HTTP 查询对象。 */
public final class ArBillRowScope {
bms-back/bms-system/src/main/java/com/bms/ar/security/ArBillScopeResolver.java → bms-back/bms-system/src/main/java/com/bms/receivable/security/ArBillScopeResolver.java
+2 -2
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/service/IArBalanceWriteoffService.java → bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBalanceWriteoffService.java
+3 -3
View File
@@ -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接口
bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillLogService.java → bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillLogService.java
+4 -4
View File
@@ -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<ArBillLog> selectLogList(ArBillLog query);
bms-back/bms-system/src/main/java/com/bms/ar/service/IArBillService.java → bms-back/bms-system/src/main/java/com/bms/receivable/service/IArBillService.java
+13 -13
View File
@@ -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;
/**
bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java → bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBalanceWriteoffServiceImpl.java
+16 -16
View File
@@ -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;
bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillLogServiceImpl.java → bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillLogServiceImpl.java
+9 -9
View File
@@ -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
bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBillServiceImpl.java → bms-back/bms-system/src/main/java/com/bms/receivable/service/impl/ArBillServiceImpl.java
+40 -40
View File
@@ -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 行开始写入。
*/
bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillExportTaskRunner.java → bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillExportTaskRunner.java
+3 -3
View File
@@ -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;
/**
* 应收账单导出异步任务执行器。
bms-back/bms-system/src/main/java/com/bms/ar/task/ArBillGenerateTaskRunner.java → bms-back/bms-system/src/main/java/com/bms/receivable/task/ArBillGenerateTaskRunner.java
+4 -4
View File
@@ -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;
/**
* 应收账单异步生成任务调度器。
bms-back/bms-system/src/main/resources/mapper/ar/ArBalanceWriteoffMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBalanceWriteoffMapper.xml
+1 -1
View File
@@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.params != null and query.params.endTime != null and query.params.endTime != ''">
and date_format(w.writeoff_date,'%y%m%d') &lt;= date_format(#{query.params.endTime},'%y%m%d')
</if>
<include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>
<include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>
</where>
order by w.create_time desc, w.writeoff_id desc
</select>
bms-back/bms-system/src/main/resources/mapper/ar/ArBankAccountMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBankAccountMapper.xml
View File
bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailFeeMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailFeeMapper.xml
+1 -1
View File
@@ -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 <include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>)
AND EXISTS (SELECT 1 FROM ar_bill b WHERE b.ar_bill_id = d.ar_bill_id <include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>)
order by f.fee_no, f.detail_fee_id
</select>
bms-back/bms-system/src/main/resources/mapper/ar/ArBillDetailMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBillDetailMapper.xml
+1 -1
View File
@@ -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 <include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>)
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 <include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>)
order by detail_no
</select>
bms-back/bms-system/src/main/resources/mapper/ar/ArBillExportMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBillExportMapper.xml
View File
bms-back/bms-system/src/main/resources/mapper/ar/ArBillGenerateTaskMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBillGenerateTaskMapper.xml
+1 -1
View File
@@ -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
<include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>)
<include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>)
order by create_time desc, task_id desc
</select>
bms-back/bms-system/src/main/resources/mapper/ar/ArBillLogMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBillLogMapper.xml
+1 -1
View File
@@ -51,7 +51,7 @@
</if>
<if test="query.requestId != null and query.requestId != ''">and l.request_id = #{query.requestId}</if>
<if test="query.result != null and query.result != ''">and l.result = #{query.result}</if>
<include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>
<include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>
</where>
order by l.create_time desc, l.log_id desc
</select>
bms-back/bms-system/src/main/resources/mapper/ar/ArBillMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBillMapper.xml
+4 -4
View File
@@ -39,7 +39,7 @@
<result property="updateTime" column="update_time"/>
</resultMap>
<resultMap id="ArBillSummaryResult" type="com.bms.ar.domain.vo.ArBillSummary">
<resultMap id="ArBillSummaryResult" type="com.bms.receivable.domain.vo.ArBillSummary">
<result property="totalAmount" column="total_amount"/>
<result property="writtenOffAmount" column="written_off_amount"/>
<result property="unwrittenAmount" column="unwritten_amount"/>
@@ -106,7 +106,7 @@
<if test="query.billDateStart != null">and bill_date &gt;= #{query.billDateStart}</if>
<if test="query.billDateEnd != null">and bill_date &lt;= #{query.billDateEnd}</if>
<if test="query.billPeriodEnd != null">and bill_period_end = #{query.billPeriodEnd}</if>
<include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>
<include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>
</where>
</sql>
@@ -132,7 +132,7 @@
<select id="selectArBillByIdScoped" resultMap="ArBillResult">
select b.* from ar_bill b where b.ar_bill_id = #{arBillId}
<include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>
<include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>
</select>
<select id="selectArBillByBillNo" parameterType="string" resultMap="ArBillResult">
@@ -172,7 +172,7 @@
and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF')
and (generation_status is null or generation_status = 'READY')
and unwritten_amount &gt; 0
<include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/>
<include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>
order by bill_date asc, ar_bill_id asc
</select>
bms-back/bms-system/src/main/resources/mapper/ar/ArBillScopeMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArBillScopeMapper.xml
+1 -1
View File
@@ -35,7 +35,7 @@
<when test="scope != null and scope.all"/>
<otherwise>
AND EXISTS (SELECT 1 FROM ctr_customer c WHERE c.customer_id = b.customer_id
<include refid="com.bms.ar.mapper.ArBillScopeMapper.customerScope"/>
<include refid="com.bms.receivable.mapper.ArBillScopeMapper.customerScope"/>
)
</otherwise>
</choose>
bms-back/bms-system/src/main/resources/mapper/ar/ArCommissionMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArCommissionMapper.xml
+7 -7
View File
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bms.ar.mapper.ArCommissionMapper">
<resultMap id="rate" type="com.bms.ar.profit.ArCommissionRate">
<resultMap id="rate" type="com.bms.receivable.profit.ArCommissionRate">
<id property="rateId" column="rate_id"/><result property="salesUserId" column="sales_user_id"/>
<result property="salesUserCode" column="sales_user_code"/><result property="salesUserName" column="sales_user_name"/>
<result property="rate" column="rate"/><result property="effectiveAt" column="effective_at"/>
<result property="createBy" column="create_by"/><result property="remark" column="remark"/>
</resultMap>
<resultMap id="missingRate" type="com.bms.ar.profit.ArWriteoffRate">
<resultMap id="missingRate" type="com.bms.receivable.profit.ArWriteoffRate">
<id property="writeoffId" column="writeoff_id"/><result property="arBillId" column="ar_bill_id"/>
<result property="billNo" column="bill_no"/><result property="customerName" column="customer_name"/>
<result property="salesUserId" column="sales_user_id"/><result property="salesUserName" column="sales_user_name"/>
@@ -16,7 +16,7 @@
<result property="status" column="status"/><result property="confirmedBy" column="confirmed_by"/>
<result property="confirmedTime" column="confirmed_time"/><result property="remark" column="confirm_remark"/>
</resultMap>
<resultMap id="commissionResult" type="com.bms.ar.profit.ArCommissionResult">
<resultMap id="commissionResult" type="com.bms.receivable.profit.ArCommissionResult">
<id property="resultId" column="result_id"/><result property="arBillId" column="ar_bill_id"/>
<result property="detailId" column="detail_id"/><result property="billNo" column="bill_no"/>
<result property="orderNo" column="order_no"/><result property="salesUserName" column="sales_user_name"/>
@@ -27,7 +27,7 @@
<result property="salesUserId" column="sales_user_id"/><result property="weightedRate" column="weighted_rate"/>
<result property="billAmount" column="bill_amount"/>
</resultMap>
<resultMap id="commissionSummary" type="com.bms.ar.profit.ArCommissionSummary">
<resultMap id="commissionSummary" type="com.bms.receivable.profit.ArCommissionSummary">
<result property="salesUserId" column="sales_user_id"/><result property="salesUserName" column="sales_user_name"/>
<result property="currency" column="currency"/><result property="orderCount" column="order_count"/>
<result property="pendingCount" column="pending_count"/><result property="commissionAmount" column="commission_amount"/>
@@ -44,7 +44,7 @@
where sales_user_id = #{salesUserId} and effective_at &lt;= #{at}
order by effective_at desc, rate_id desc limit 1 for update
</select>
<insert id="insertRate" parameterType="com.bms.ar.profit.ArCommissionRate" useGeneratedKeys="true" keyProperty="rateId">
<insert id="insertRate" parameterType="com.bms.receivable.profit.ArCommissionRate" useGeneratedKeys="true" keyProperty="rateId">
insert into ar_profit_commission_rate(sales_user_id, rate, effective_at, create_by, create_time, remark)
values(#{salesUserId}, #{rate}, #{effectiveAt}, #{createBy}, sysdate(), #{remark})
</insert>
@@ -104,7 +104,7 @@
<otherwise>and r.result_status != 'REVERSED' and b.status = 'WRITTEN_OFF' and b.generation_status = 'READY'</otherwise>
</choose>
<if test="billId != null">and r.ar_bill_id = #{billId}</if>
<include refid="com.bms.ar.mapper.ArProfitMapper.scopeCondition"/>
<include refid="com.bms.receivable.mapper.ArProfitMapper.scopeCondition"/>
order by r.result_id desc
</select>
<select id="selectCommissionSummary" resultMap="commissionSummary">
@@ -121,7 +121,7 @@
from ar_profit_commission_result r join ar_bill b on b.ar_bill_id = r.ar_bill_id
where r.result_status != 'REVERSED' and b.status = 'WRITTEN_OFF' and b.generation_status = 'READY'
<if test="billId != null">and r.ar_bill_id = #{billId}</if>
<include refid="com.bms.ar.mapper.ArProfitMapper.scopeCondition"/>
<include refid="com.bms.receivable.mapper.ArProfitMapper.scopeCondition"/>
group by r.sales_user_id, r.currency
order by sales_user_name, r.currency
</select>
bms-back/bms-system/src/main/resources/mapper/ar/ArExportTemplateMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArExportTemplateMapper.xml
View File
bms-back/bms-system/src/main/resources/mapper/ar/ArProfitMapper.xml → bms-back/bms-system/src/main/resources/mapper/receivable/ArProfitMapper.xml
+5 -5
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bms.ar.mapper.ArProfitMapper">
<resultMap id="row" type="com.bms.ar.profit.ArProfitRow">
<resultMap id="row" type="com.bms.receivable.profit.ArProfitRow">
<id property="arBillId" column="ar_bill_id"/>
<result property="billNo" column="bill_no"/><result property="billName" column="bill_name"/>
<result property="billDate" column="bill_date"/>
@@ -13,19 +13,19 @@
<result property="salesGrossMarginRate" column="sales_gross_margin_rate"/>
<result property="writtenOffAmount" column="written_off_amount"/><result property="unwrittenAmount" column="unwritten_amount"/>
</resultMap>
<resultMap id="summary" type="com.bms.ar.profit.ArProfitSummary">
<resultMap id="summary" type="com.bms.receivable.profit.ArProfitSummary">
<result property="currency" column="currency"/><result property="billCount" column="bill_count"/>
<result property="salesAmount" column="sales_amount"/><result property="productAmount" column="product_amount"/>
<result property="salesGrossProfit" column="sales_gross_profit"/><result property="salesGrossMarginRate" column="sales_gross_margin_rate"/>
<result property="commissionAmount" column="commission_amount"/>
<result property="writtenOffAmount" column="written_off_amount"/><result property="unwrittenAmount" column="unwritten_amount"/>
</resultMap>
<resultMap id="detail" type="com.bms.ar.domain.ArBillDetail">
<resultMap id="detail" type="com.bms.receivable.domain.ArBillDetail">
<id property="detailId" column="detail_id"/><result property="orderNo" column="order_no"/>
<result property="productName" column="product_name"/><result property="currency" column="currency"/>
<result property="totalAmount" column="total_amount"/>
</resultMap>
<resultMap id="fee" type="com.bms.ar.domain.ArBillDetailFee">
<resultMap id="fee" type="com.bms.receivable.domain.ArBillDetailFee">
<id property="detailFeeId" column="detail_fee_id"/><result property="detailId" column="detail_id"/>
<result property="feeName" column="fee_name"/><result property="feeType" column="fee_type"/>
<result property="amount" column="amount"/><result property="productAmount" column="product_amount"/>
@@ -133,7 +133,7 @@
) commission on commission.currency = t.currency
group by t.currency order by t.currency
</select>
<select id="selectSalesOptions" resultType="com.bms.ar.profit.ArProfitSalesOption">
<select id="selectSalesOptions" resultType="com.bms.receivable.profit.ArProfitSalesOption">
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'
bms-back/bms-system/src/main/resources/templates/ar/ar_bill_template.xlsx → bms-back/bms-system/src/main/resources/templates/receivable/ar_bill_template.xlsx
View File