调整命名

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
@@ -13,13 +13,13 @@ import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.domain.ArBalanceWriteoff; import com.bms.receivable.domain.ArBalanceWriteoff;
import com.bms.ar.domain.vo.ArBillListExportRow; import com.bms.receivable.domain.vo.ArBillListExportRow;
import com.bms.ar.domain.vo.ArBillQuery; import com.bms.receivable.domain.vo.ArBillQuery;
import com.bms.ar.domain.vo.ArBillSummary; import com.bms.receivable.domain.vo.ArBillSummary;
import com.bms.ar.service.IArBalanceWriteoffService; import com.bms.receivable.service.IArBalanceWriteoffService;
import com.bms.ar.service.IArBillService; import com.bms.receivable.service.IArBillService;
import com.bms.common.annotation.Log; import com.bms.common.annotation.Log;
import com.bms.common.core.controller.BaseController; import com.bms.common.core.controller.BaseController;
import com.bms.common.core.domain.AjaxResult; import com.bms.common.core.domain.AjaxResult;
@@ -1,4 +1,4 @@
package com.bms.web.controller.ar; package com.bms.web.controller.receivable;
import java.util.List; 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.bms.ar.domain.ArBankAccount; import com.bms.receivable.domain.ArBankAccount;
import com.bms.ar.service.IArBillService; import com.bms.receivable.service.IArBillService;
import com.bms.common.core.controller.BaseController; import com.bms.common.core.controller.BaseController;
import com.bms.common.core.domain.AjaxResult; import com.bms.common.core.domain.AjaxResult;
@@ -1,4 +1,4 @@
package com.bms.web.controller.ar; package com.bms.web.controller.receivable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; 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.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.domain.ArBankAccount; import com.bms.receivable.domain.ArBankAccount;
import com.bms.ar.domain.ArBillDetailFee; import com.bms.receivable.domain.ArBillDetailFee;
import com.bms.ar.domain.ArBillExport; import com.bms.receivable.domain.ArBillGenerateTask;
import com.bms.ar.domain.ArBillGenerateTask; import com.bms.receivable.domain.ArBillLog;
import com.bms.ar.domain.ArBillLog; import com.bms.receivable.domain.vo.ArBillActionRequest;
import com.bms.ar.domain.vo.ArBillActionRequest; import com.bms.receivable.domain.vo.ArBillGenerateQuery;
import com.bms.ar.domain.vo.ArBillGenerateQuery; import com.bms.receivable.domain.vo.ArBillGeneratePreviewExportRow;
import com.bms.ar.domain.vo.ArBillGeneratePreviewExportRow; import com.bms.receivable.domain.vo.ArBillGenerateRequest;
import com.bms.ar.domain.vo.ArBillGenerateRequest; import com.bms.receivable.domain.vo.ArBillListExportRow;
import com.bms.ar.domain.vo.ArBillListExportRow; import com.bms.receivable.domain.vo.ArBillQuery;
import com.bms.ar.domain.vo.ArBillQuery; import com.bms.receivable.enums.ArBillDateType;
import com.bms.ar.enums.ArBillDateType; import com.bms.receivable.service.IArBillService;
import com.bms.ar.service.IArBillService; import com.bms.receivable.security.ArBillScopeResolver;
import com.bms.ar.security.ArBillScopeResolver;
import com.bms.common.annotation.Log; import com.bms.common.annotation.Log;
import com.bms.common.core.controller.BaseController; import com.bms.common.core.controller.BaseController;
import com.bms.common.core.domain.AjaxResult; import com.bms.common.core.domain.AjaxResult;
@@ -1,4 +1,4 @@
package com.bms.web.controller.ar; package com.bms.web.controller.receivable;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.format.DateTimeFormatter; 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.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.bms.ar.domain.ArBalanceWriteoff; import com.bms.receivable.domain.ArBalanceWriteoff;
import com.bms.ar.domain.ArBill; import com.bms.receivable.service.IArBalanceWriteoffService;
import com.bms.ar.service.IArBalanceWriteoffService;
import com.bms.common.annotation.Log; import com.bms.common.annotation.Log;
import com.bms.common.core.controller.BaseController; import com.bms.common.core.controller.BaseController;
import com.bms.common.core.domain.AjaxResult; import com.bms.common.core.domain.AjaxResult;
@@ -6,16 +6,16 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.bms.ar.profit.ArCommissionRate; import com.bms.receivable.profit.ArCommissionRate;
import com.bms.ar.profit.ArCommissionService; import com.bms.receivable.profit.ArCommissionService;
import com.bms.ar.profit.ArProfitQuery; import com.bms.receivable.profit.ArProfitQuery;
import com.bms.ar.profit.ArProfitService; import com.bms.receivable.profit.ArProfitService;
import com.bms.ar.profit.ArWriteoffRate; import com.bms.receivable.profit.ArWriteoffRate;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import com.bms.ar.profit.ArProfitRow; import com.bms.receivable.profit.ArProfitRow;
import com.bms.ar.profit.ArCommissionResult; import com.bms.receivable.profit.ArCommissionResult;
import com.bms.common.utils.poi.ExcelUtil; import com.bms.common.utils.poi.ExcelUtil;
import com.bms.price.enums.ProfitAreaRule; import com.bms.price.enums.ProfitAreaRule;
import com.bms.common.annotation.Log; import com.bms.common.annotation.Log;
@@ -11,14 +11,14 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import com.bms.ar.domain.ArBalanceWriteoff; import com.bms.receivable.domain.ArBalanceWriteoff;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.mapper.ArCommissionMapper; import com.bms.receivable.mapper.ArCommissionMapper;
import com.bms.ar.profit.ArCommissionRate; import com.bms.receivable.profit.ArCommissionRate;
import com.bms.ar.profit.ArCommissionResult; import com.bms.receivable.profit.ArCommissionResult;
import com.bms.ar.profit.ArCommissionService; import com.bms.receivable.profit.ArCommissionService;
import com.bms.ar.profit.ArProfitScope; import com.bms.receivable.profit.ArProfitScope;
import com.bms.ar.profit.ArProfitScopeResolver; import com.bms.receivable.profit.ArProfitScopeResolver;
import com.bms.common.exception.ServiceException; import com.bms.common.exception.ServiceException;
class ArCommissionServiceTest class ArCommissionServiceTest
@@ -8,9 +8,9 @@ import java.util.Map;
import org.apache.ibatis.builder.xml.XMLMapperBuilder; import org.apache.ibatis.builder.xml.XMLMapperBuilder;
import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.Configuration;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import com.bms.ar.profit.ArProfitQuery; import com.bms.receivable.profit.ArProfitQuery;
import com.bms.ar.profit.ArProfitScope; import com.bms.receivable.profit.ArProfitScope;
import com.bms.ar.profit.ArCommissionResult; import com.bms.receivable.profit.ArCommissionResult;
class ArProfitMapperSqlTest class ArProfitMapperSqlTest
{ {
@@ -18,7 +18,7 @@ class ArProfitMapperSqlTest
void commissionInReportSummaryUsesBillFiltersAndDataScope() throws Exception void commissionInReportSummaryUsesBillFiltersAndDataScope() throws Exception
{ {
Configuration configuration = new Configuration(); Configuration configuration = new Configuration();
String resource = "mapper/ar/ArProfitMapper.xml"; String resource = "mapper/receivable/ArProfitMapper.xml";
try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource)) try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource))
{ {
new XMLMapperBuilder(input, configuration, resource, configuration.getSqlFragments()).parse(); new XMLMapperBuilder(input, configuration, resource, configuration.getSqlFragments()).parse();
@@ -65,7 +65,7 @@ class ArProfitMapperSqlTest
{ {
Configuration configuration = new Configuration(); Configuration configuration = new Configuration();
// 提成 Mapper 先加载时也必须能解析引用的报表权限片段。 // 提成 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)) try (InputStream input = getClass().getClassLoader().getResourceAsStream(resource))
{ {
@@ -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.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import java.util.Set; import java.util.Set;
import org.junit.jupiter.api.Test; 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.SysRole;
import com.bms.common.core.domain.entity.SysUser; import com.bms.common.core.domain.entity.SysUser;
import com.bms.common.core.domain.model.LoginUser; import com.bms.common.core.domain.model.LoginUser;
@@ -6,9 +6,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.List; import java.util.List;
import com.bms.ar.profit.CommissionCalculator; import com.bms.receivable.profit.CommissionCalculator;
import com.bms.ar.profit.ArCommissionResult; import com.bms.receivable.profit.ArCommissionResult;
import com.bms.ar.profit.CommissionCalculator.Writeoff; import com.bms.receivable.profit.CommissionCalculator.Writeoff;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
class CommissionCalculatorTest class CommissionCalculatorTest
@@ -15,8 +15,8 @@ import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import com.bms.common.exception.ServiceException; import com.bms.common.exception.ServiceException;
import com.bms.common.utils.SecurityUtils; import com.bms.common.utils.SecurityUtils;
import com.bms.ar.domain.ArBankAccount; import com.bms.receivable.domain.ArBankAccount;
import com.bms.ar.mapper.ArBankAccountMapper; import com.bms.receivable.mapper.ArBankAccountMapper;
import com.bms.customer.customerinfo.domain.BmsCustomer; import com.bms.customer.customerinfo.domain.BmsCustomer;
import com.bms.customer.customerinfo.domain.BmsCustomerAttachment; import com.bms.customer.customerinfo.domain.BmsCustomerAttachment;
import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; import com.bms.customer.customerinfo.mapper.BmsCustomerMapper;
@@ -6,7 +6,6 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashSet; import java.util.HashSet;
@@ -28,8 +27,8 @@ import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.transaction.support.TransactionSynchronizationManager;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.bms.ar.enums.ArIncomeBillFeeStatus; import com.bms.receivable.enums.ArIncomeBillFeeStatus;
import com.bms.ar.enums.ArOrderBillStatus; import com.bms.receivable.enums.ArOrderBillStatus;
import com.bms.common.annotation.DataScope; import com.bms.common.annotation.DataScope;
import com.bms.common.core.domain.entity.SysUser; import com.bms.common.core.domain.entity.SysUser;
import com.bms.common.exception.ServiceException; import com.bms.common.exception.ServiceException;
@@ -1,4 +1,4 @@
package com.bms.ar.config; package com.bms.receivable.config;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.domain; package com.bms.receivable.domain;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo; package com.bms.receivable.domain.vo;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo; package com.bms.receivable.domain.vo;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo; package com.bms.receivable.domain.vo;
import java.util.Date; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo; package com.bms.receivable.domain.vo;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@@ -8,7 +8,7 @@ import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import com.bms.common.config.serializer.StrictDateDeserializer; import com.bms.common.config.serializer.StrictDateDeserializer;
import com.bms.ar.enums.ArBillSelectionMode; import com.bms.receivable.enums.ArBillSelectionMode;
import lombok.Data; import lombok.Data;
/** 从订单计费结果生成正式账单的参数。 */ /** 从订单计费结果生成正式账单的参数。 */
@@ -1,11 +1,11 @@
package com.bms.ar.domain.vo; package com.bms.receivable.domain.vo;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.enums.ArBillStatus; import com.bms.receivable.enums.ArBillStatus;
import com.bms.common.annotation.Excel; import com.bms.common.annotation.Excel;
import lombok.Data; import lombok.Data;
@@ -1,9 +1,9 @@
package com.bms.ar.domain.vo; package com.bms.receivable.domain.vo;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
@@ -1,4 +1,4 @@
package com.bms.ar.domain.vo; package com.bms.receivable.domain.vo;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** /**
* 应收账单余额核销单状态。 * 应收账单余额核销单状态。
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收账单生成时用于截止日筛选的来源订单日期字段。 */ /** 应收账单生成时用于截止日筛选的来源订单日期字段。 */
public enum ArBillDateType public enum ArBillDateType
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收账单异步生成任务状态。 */ /** 应收账单异步生成任务状态。 */
public final class ArBillGenerateTaskStatus public final class ArBillGenerateTaskStatus
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收账单生成状态,与账单业务状态分离。 */ /** 应收账单生成状态,与账单业务状态分离。 */
public final class ArBillGenerationStatus public final class ArBillGenerationStatus
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** /**
* 应收账单生成时的订单选择模式。 * 应收账单生成时的订单选择模式。
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收账单状态。数据库保存值使用 code,避免业务代码散落状态字符串。 */ /** 应收账单状态。数据库保存值使用 code,避免业务代码散落状态字符串。 */
public enum ArBillStatus public enum ArBillStatus
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** /**
* 应收账单导出任务状态。 * 应收账单导出任务状态。
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收费用明细是否已经生成正式应收账单。 */ /** 应收费用明细是否已经生成正式应收账单。 */
public enum ArIncomeBillFeeStatus public enum ArIncomeBillFeeStatus
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收日志关联对象类型。 */ /** 应收日志关联对象类型。 */
public enum ArLogObjectType public enum ArLogObjectType
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收日志操作来源。 */ /** 应收日志操作来源。 */
public enum ArLogOperationSource public enum ArLogOperationSource
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收日志操作类型。 */ /** 应收日志操作类型。 */
public enum ArLogOperationType public enum ArLogOperationType
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 应收操作日志结果。 */ /** 应收操作日志结果。 */
public enum ArLogResult public enum ArLogResult
@@ -1,4 +1,4 @@
package com.bms.ar.enums; package com.bms.receivable.enums;
/** 计费订单的应收账单状态。 */ /** 计费订单的应收账单状态。 */
public enum ArOrderBillStatus public enum ArOrderBillStatus
@@ -1,4 +1,4 @@
package com.bms.ar.event; package com.bms.receivable.event;
/** /**
* 应收账单导出任务已提交事件。 * 应收账单导出任务已提交事件。
@@ -1,4 +1,4 @@
package com.bms.ar.event; package com.bms.receivable.event;
/** /**
* 应收账单异步生成任务已提交事件。 * 应收账单异步生成任务已提交事件。
@@ -1,10 +1,10 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.List; import java.util.List;
import com.bms.ar.security.ArBillRowScope; import com.bms.receivable.security.ArBillRowScope;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBalanceWriteoff; import com.bms.receivable.domain.ArBalanceWriteoff;
/** /**
* 应收账单余额核销 Mapper * 应收账单余额核销 Mapper
@@ -1,9 +1,9 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBankAccount; import com.bms.receivable.domain.ArBankAccount;
public interface ArBankAccountMapper { public interface ArBankAccountMapper {
ArBankAccount selectDefaultByCurrency(@Param("currency") String currency); ArBankAccount selectDefaultByCurrency(@Param("currency") String currency);
@@ -1,10 +1,10 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.List; import java.util.List;
import com.bms.ar.security.ArBillRowScope; import com.bms.receivable.security.ArBillRowScope;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBillDetailFee; import com.bms.receivable.domain.ArBillDetailFee;
public interface ArBillDetailFeeMapper { public interface ArBillDetailFeeMapper {
List<ArBillDetailFee> selectByBillIdAndDetailIdScoped(@Param("arBillId") Long arBillId, @Param("detailId") Long detailId, @Param("scope") ArBillRowScope scope); List<ArBillDetailFee> selectByBillIdAndDetailIdScoped(@Param("arBillId") Long arBillId, @Param("detailId") Long detailId, @Param("scope") ArBillRowScope scope);
@@ -1,12 +1,12 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.List; import java.util.List;
import com.bms.ar.security.ArBillRowScope; import com.bms.receivable.security.ArBillRowScope;
import java.util.Map; import java.util.Map;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBillDetail; import com.bms.receivable.domain.ArBillDetail;
public interface ArBillDetailMapper { public interface ArBillDetailMapper {
List<ArBillDetail> selectByBillIdScoped(@Param("arBillId") Long arBillId, @Param("scope") ArBillRowScope scope); List<ArBillDetail> selectByBillIdScoped(@Param("arBillId") Long arBillId, @Param("scope") ArBillRowScope scope);
@@ -1,10 +1,10 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBillExport; import com.bms.receivable.domain.ArBillExport;
public interface ArBillExportMapper { public interface ArBillExportMapper {
List<ArBillExport> selectByBillId(Long arBillId); List<ArBillExport> selectByBillId(Long arBillId);
@@ -1,17 +1,17 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBillGenerateTask; import com.bms.receivable.domain.ArBillGenerateTask;
/** /**
* 应收账单异步生成任务 Mapper。 * 应收账单异步生成任务 Mapper。
*/ */
public interface ArBillGenerateTaskMapper { public interface ArBillGenerateTaskMapper {
List<ArBillGenerateTask> selectActiveByCreateByScoped(@Param("createBy") String createBy, 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); ArBillGenerateTask selectById(Long taskId);
@@ -1,10 +1,10 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.List; import java.util.List;
import com.bms.ar.security.ArBillRowScope; import com.bms.receivable.security.ArBillRowScope;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBillLog; import com.bms.receivable.domain.ArBillLog;
public interface ArBillLogMapper public interface ArBillLogMapper
{ {
@@ -1,14 +1,14 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.bms.ar.security.ArBillRowScope; import com.bms.receivable.security.ArBillRowScope;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.domain.vo.ArBillQuery; import com.bms.receivable.domain.vo.ArBillQuery;
import com.bms.ar.domain.vo.ArBillSummary; import com.bms.receivable.domain.vo.ArBillSummary;
public interface ArBillMapper { public interface ArBillMapper {
List<ArBill> selectArBillList(@Param("query") ArBillQuery query, @Param("scope") ArBillRowScope scope); List<ArBill> selectArBillList(@Param("query") ArBillQuery query, @Param("scope") ArBillRowScope scope);
@@ -1,8 +1,8 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; 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; import com.bms.customer.customerinfo.domain.BmsCustomerOption;
public interface ArBillScopeMapper { public interface ArBillScopeMapper {
@@ -1,13 +1,13 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.profit.ArCommissionRate; import com.bms.receivable.profit.ArCommissionRate;
import com.bms.ar.profit.ArWriteoffRate; import com.bms.receivable.profit.ArWriteoffRate;
import com.bms.ar.profit.ArCommissionResult; import com.bms.receivable.profit.ArCommissionResult;
import com.bms.ar.profit.ArCommissionSummary; import com.bms.receivable.profit.ArCommissionSummary;
import com.bms.ar.profit.ArProfitScope; import com.bms.receivable.profit.ArProfitScope;
public interface ArCommissionMapper public interface ArCommissionMapper
{ {
@@ -1,9 +1,9 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.Date; import java.util.Date;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.domain.ArExportTemplate; import com.bms.receivable.domain.ArExportTemplate;
public interface ArExportTemplateMapper { public interface ArExportTemplateMapper {
/** /**
@@ -1,14 +1,14 @@
package com.bms.ar.mapper; package com.bms.receivable.mapper;
import java.util.List; import java.util.List;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.bms.ar.profit.ArProfitQuery; import com.bms.receivable.profit.ArProfitQuery;
import com.bms.ar.profit.ArProfitRow; import com.bms.receivable.profit.ArProfitRow;
import com.bms.ar.profit.ArProfitScope; import com.bms.receivable.profit.ArProfitScope;
import com.bms.ar.profit.ArProfitSummary; import com.bms.receivable.profit.ArProfitSummary;
import com.bms.ar.profit.ArProfitSalesOption; import com.bms.receivable.profit.ArProfitSalesOption;
import com.bms.ar.domain.ArBillDetailFee; import com.bms.receivable.domain.ArBillDetailFee;
import com.bms.ar.domain.ArBillDetail; import com.bms.receivable.domain.ArBillDetail;
public interface ArProfitMapper public interface ArProfitMapper
{ {
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -1,17 +1,17 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.bms.ar.domain.ArBalanceWriteoff; import com.bms.receivable.domain.ArBalanceWriteoff;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.mapper.ArCommissionMapper; import com.bms.receivable.mapper.ArCommissionMapper;
import com.bms.ar.mapper.ArBillMapper; import com.bms.receivable.mapper.ArBillMapper;
import com.bms.ar.enums.ArBillStatus; import com.bms.receivable.enums.ArBillStatus;
import com.bms.ar.enums.ArBillGenerationStatus; import com.bms.receivable.enums.ArBillGenerationStatus;
import com.bms.ar.security.ArBillRoleKeys; import com.bms.receivable.security.ArBillRoleKeys;
import com.bms.common.exception.ServiceException; import com.bms.common.exception.ServiceException;
import com.bms.common.core.domain.entity.SysUser; import com.bms.common.core.domain.entity.SysUser;
import com.bms.common.utils.SecurityUtils; import com.bms.common.utils.SecurityUtils;
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.util.Date; import java.util.Date;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import lombok.Data; import lombok.Data;
@@ -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) public record ArProfitScope(boolean all, boolean self, boolean department, Long userId, Long deptId)
@@ -1,9 +1,9 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.util.Arrays; import java.util.Arrays;
import java.util.Set; import java.util.Set;
import org.springframework.stereotype.Component; 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.constant.Constants;
import com.bms.common.core.domain.entity.SysRole; import com.bms.common.core.domain.entity.SysRole;
import com.bms.common.core.domain.entity.SysUser; import com.bms.common.core.domain.entity.SysUser;
@@ -1,10 +1,10 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.util.List; import java.util.List;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.bms.ar.mapper.ArProfitMapper; import com.bms.receivable.mapper.ArProfitMapper;
import com.bms.ar.domain.ArBillDetailFee; import com.bms.receivable.domain.ArBillDetailFee;
import com.bms.ar.domain.ArBillDetail; import com.bms.receivable.domain.ArBillDetail;
@Service @Service
public class ArProfitService public class ArProfitService
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import lombok.Data; import lombok.Data;
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@@ -1,4 +1,4 @@
package com.bms.ar.profit; package com.bms.receivable.profit;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@@ -1,4 +1,4 @@
package com.bms.ar.security; package com.bms.receivable.security;
import java.util.Set; import java.util.Set;
@@ -1,4 +1,4 @@
package com.bms.ar.security; package com.bms.receivable.security;
/** 仅由后端构造,不能绑定到 HTTP 查询对象。 */ /** 仅由后端构造,不能绑定到 HTTP 查询对象。 */
public final class ArBillRowScope { public final class ArBillRowScope {
@@ -1,4 +1,4 @@
package com.bms.ar.security; package com.bms.receivable.security;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -7,7 +7,7 @@ import java.util.function.Supplier;
import com.github.pagehelper.Page; import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import org.springframework.stereotype.Component; 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.constant.Constants;
import com.bms.common.core.domain.entity.SysRole; import com.bms.common.core.domain.entity.SysRole;
import com.bms.common.core.domain.entity.SysUser; import com.bms.common.core.domain.entity.SysUser;
@@ -1,8 +1,8 @@
package com.bms.ar.service; package com.bms.receivable.service;
import java.util.List; import java.util.List;
import com.bms.ar.domain.ArBalanceWriteoff; import com.bms.receivable.domain.ArBalanceWriteoff;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
/** /**
* 应收账单余额核销 Service接口 * 应收账单余额核销 Service接口
@@ -1,10 +1,10 @@
package com.bms.ar.service; package com.bms.receivable.service;
import java.util.List; import java.util.List;
import com.bms.ar.domain.ArBillLog; import com.bms.receivable.domain.ArBillLog;
import com.bms.ar.enums.ArLogObjectType; import com.bms.receivable.enums.ArLogObjectType;
import com.bms.ar.enums.ArLogOperationType; import com.bms.receivable.enums.ArLogOperationType;
public interface IArBillLogService { public interface IArBillLogService {
List<ArBillLog> selectLogList(ArBillLog query); List<ArBillLog> selectLogList(ArBillLog query);
@@ -1,20 +1,20 @@
package com.bms.ar.service; package com.bms.receivable.service;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.domain.ArBankAccount; import com.bms.receivable.domain.ArBankAccount;
import com.bms.ar.domain.ArBillDetail; import com.bms.receivable.domain.ArBillDetail;
import com.bms.ar.domain.ArBillDetailFee; import com.bms.receivable.domain.ArBillDetailFee;
import com.bms.ar.domain.ArBillExport; import com.bms.receivable.domain.ArBillExport;
import com.bms.ar.domain.ArBillGenerateTask; import com.bms.receivable.domain.ArBillGenerateTask;
import com.bms.ar.domain.ArBillLog; import com.bms.receivable.domain.ArBillLog;
import com.bms.ar.domain.vo.ArBillGenerateRequest; import com.bms.receivable.domain.vo.ArBillGenerateRequest;
import com.bms.ar.domain.vo.ArBillGenerateQuery; import com.bms.receivable.domain.vo.ArBillGenerateQuery;
import com.bms.ar.domain.vo.ArBillActionRequest; import com.bms.receivable.domain.vo.ArBillActionRequest;
import com.bms.ar.domain.vo.ArBillQuery; import com.bms.receivable.domain.vo.ArBillQuery;
import com.bms.ar.domain.vo.ArBillSummary; import com.bms.receivable.domain.vo.ArBillSummary;
import com.bms.price.domain.PrcOrderBill; import com.bms.price.domain.PrcOrderBill;
/** /**
@@ -1,4 +1,4 @@
package com.bms.ar.service.impl; package com.bms.receivable.service.impl;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@@ -12,21 +12,21 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import com.bms.ar.domain.ArBalanceWriteoff; import com.bms.receivable.domain.ArBalanceWriteoff;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.domain.ArBillLog; import com.bms.receivable.domain.ArBillLog;
import com.bms.ar.enums.ArBalanceWriteoffStatus; import com.bms.receivable.enums.ArBalanceWriteoffStatus;
import com.bms.ar.enums.ArBillStatus; import com.bms.receivable.enums.ArBillStatus;
import com.bms.ar.enums.ArLogObjectType; import com.bms.receivable.enums.ArLogObjectType;
import com.bms.ar.enums.ArLogOperationSource; import com.bms.receivable.enums.ArLogOperationSource;
import com.bms.ar.enums.ArLogOperationType; import com.bms.receivable.enums.ArLogOperationType;
import com.bms.ar.enums.ArLogResult; import com.bms.receivable.enums.ArLogResult;
import com.bms.ar.mapper.ArBalanceWriteoffMapper; import com.bms.receivable.mapper.ArBalanceWriteoffMapper;
import com.bms.ar.mapper.ArBillMapper; import com.bms.receivable.mapper.ArBillMapper;
import com.bms.ar.security.ArBillScopeResolver; import com.bms.receivable.security.ArBillScopeResolver;
import com.bms.ar.profit.ArCommissionService; import com.bms.receivable.profit.ArCommissionService;
import com.bms.ar.service.IArBalanceWriteoffService; import com.bms.receivable.service.IArBalanceWriteoffService;
import com.bms.ar.service.IArBillLogService; import com.bms.receivable.service.IArBillLogService;
import com.bms.common.exception.ServiceException; import com.bms.common.exception.ServiceException;
import com.bms.common.utils.SecurityUtils; import com.bms.common.utils.SecurityUtils;
import com.bms.customer.customermoney.domain.CustomerReceipt; import com.bms.customer.customermoney.domain.CustomerReceipt;
@@ -1,4 +1,4 @@
package com.bms.ar.service.impl; package com.bms.receivable.service.impl;
import java.util.List; import java.util.List;
@@ -6,14 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import com.bms.ar.domain.ArBillLog; import com.bms.receivable.domain.ArBillLog;
import com.bms.ar.enums.ArLogObjectType; import com.bms.receivable.enums.ArLogObjectType;
import com.bms.ar.enums.ArLogOperationSource; import com.bms.receivable.enums.ArLogOperationSource;
import com.bms.ar.enums.ArLogOperationType; import com.bms.receivable.enums.ArLogOperationType;
import com.bms.ar.enums.ArLogResult; import com.bms.receivable.enums.ArLogResult;
import com.bms.ar.mapper.ArBillLogMapper; import com.bms.receivable.mapper.ArBillLogMapper;
import com.bms.ar.security.ArBillScopeResolver; import com.bms.receivable.security.ArBillScopeResolver;
import com.bms.ar.service.IArBillLogService; import com.bms.receivable.service.IArBillLogService;
import com.bms.common.utils.uuid.IdUtils; import com.bms.common.utils.uuid.IdUtils;
@Service @Service
@@ -1,4 +1,4 @@
package com.bms.ar.service.impl; package com.bms.receivable.service.impl;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@@ -44,49 +44,49 @@ import org.springframework.transaction.support.TransactionTemplate;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSON;
import com.bms.ar.domain.ArBill; import com.bms.receivable.domain.ArBill;
import com.bms.ar.domain.ArBankAccount; import com.bms.receivable.domain.ArBankAccount;
import com.bms.ar.domain.ArBillDetail; import com.bms.receivable.domain.ArBillDetail;
import com.bms.ar.domain.ArBillDetailFee; import com.bms.receivable.domain.ArBillDetailFee;
import com.bms.ar.domain.ArBillExport; import com.bms.receivable.domain.ArBillExport;
import com.bms.ar.domain.ArBillGenerateTask; import com.bms.receivable.domain.ArBillGenerateTask;
import com.bms.ar.domain.ArBillLog; import com.bms.receivable.domain.ArBillLog;
import com.bms.ar.domain.ArExportTemplate; import com.bms.receivable.domain.ArExportTemplate;
import com.bms.ar.event.ArBillExportTaskEvent; import com.bms.receivable.event.ArBillExportTaskEvent;
import com.bms.ar.event.ArBillGenerateTaskEvent; import com.bms.receivable.event.ArBillGenerateTaskEvent;
import com.bms.ar.enums.ArBillGenerateTaskStatus; import com.bms.receivable.enums.ArBillGenerateTaskStatus;
import com.bms.ar.enums.ArBillDateType; import com.bms.receivable.enums.ArBillDateType;
import com.bms.ar.enums.ArBillGenerationStatus; import com.bms.receivable.enums.ArBillGenerationStatus;
import com.bms.ar.enums.ArBillSelectionMode; import com.bms.receivable.enums.ArBillSelectionMode;
import com.bms.ar.enums.ArBillStatus; import com.bms.receivable.enums.ArBillStatus;
import com.bms.ar.enums.ArExportStatus; import com.bms.receivable.enums.ArExportStatus;
import com.bms.ar.enums.ArIncomeBillFeeStatus; import com.bms.receivable.enums.ArIncomeBillFeeStatus;
import com.bms.ar.enums.ArLogObjectType; import com.bms.receivable.enums.ArLogObjectType;
import com.bms.ar.enums.ArLogOperationSource; import com.bms.receivable.enums.ArLogOperationSource;
import com.bms.ar.enums.ArLogOperationType; import com.bms.receivable.enums.ArLogOperationType;
import com.bms.ar.enums.ArLogResult; import com.bms.receivable.enums.ArLogResult;
import com.bms.ar.enums.ArOrderBillStatus; import com.bms.receivable.enums.ArOrderBillStatus;
import com.bms.ar.mapper.ArBillDetailFeeMapper; import com.bms.receivable.mapper.ArBillDetailFeeMapper;
import com.bms.ar.mapper.ArBillDetailMapper; import com.bms.receivable.mapper.ArBillDetailMapper;
import com.bms.ar.mapper.ArBillExportMapper; import com.bms.receivable.mapper.ArBillExportMapper;
import com.bms.ar.mapper.ArBillLogMapper; import com.bms.receivable.mapper.ArBillLogMapper;
import com.bms.ar.mapper.ArBillMapper; import com.bms.receivable.mapper.ArBillMapper;
import com.bms.ar.security.ArBillScopeResolver; import com.bms.receivable.security.ArBillScopeResolver;
import com.bms.customer.customerinfo.domain.BmsCustomerOption; import com.bms.customer.customerinfo.domain.BmsCustomerOption;
import com.bms.customer.customerinfo.domain.BmsCustomer; import com.bms.customer.customerinfo.domain.BmsCustomer;
import com.bms.customer.customerinfo.mapper.BmsCustomerMapper; import com.bms.customer.customerinfo.mapper.BmsCustomerMapper;
import com.bms.common.core.domain.entity.SysUser; import com.bms.common.core.domain.entity.SysUser;
import com.bms.system.mapper.SysUserMapper; import com.bms.system.mapper.SysUserMapper;
import com.bms.ar.mapper.ArBillGenerateTaskMapper; import com.bms.receivable.mapper.ArBillGenerateTaskMapper;
import com.bms.ar.mapper.ArBankAccountMapper; import com.bms.receivable.mapper.ArBankAccountMapper;
import com.bms.ar.mapper.ArExportTemplateMapper; import com.bms.receivable.mapper.ArExportTemplateMapper;
import com.bms.ar.service.IArBillLogService; import com.bms.receivable.service.IArBillLogService;
import com.bms.ar.service.IArBillService; import com.bms.receivable.service.IArBillService;
import com.bms.ar.domain.vo.ArBillActionRequest; import com.bms.receivable.domain.vo.ArBillActionRequest;
import com.bms.ar.domain.vo.ArBillGenerateQuery; import com.bms.receivable.domain.vo.ArBillGenerateQuery;
import com.bms.ar.domain.vo.ArBillGenerateRequest; import com.bms.receivable.domain.vo.ArBillGenerateRequest;
import com.bms.ar.domain.vo.ArBillQuery; import com.bms.receivable.domain.vo.ArBillQuery;
import com.bms.ar.domain.vo.ArBillSummary; import com.bms.receivable.domain.vo.ArBillSummary;
import com.bms.common.config.BmsConfig; import com.bms.common.config.BmsConfig;
import com.bms.common.exception.ServiceException; import com.bms.common.exception.ServiceException;
import com.bms.common.utils.DateUtils; 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 Logger log = LoggerFactory.getLogger(ArBillServiceImpl.class);
private static final String EXPORT_TEMPLATE_BUSINESS_TYPE = "AR_BILL"; 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 行开始写入。 * Excel 行号从 1 开始;模板第 4 行是表头,明细从第 5 行开始写入。
*/ */
@@ -1,4 +1,4 @@
package com.bms.ar.task; package com.bms.receivable.task;
import java.util.Date; import java.util.Date;
@@ -12,8 +12,8 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionPhase;
import org.springframework.transaction.event.TransactionalEventListener; import org.springframework.transaction.event.TransactionalEventListener;
import com.bms.ar.event.ArBillExportTaskEvent; import com.bms.receivable.event.ArBillExportTaskEvent;
import com.bms.ar.service.IArBillService; import com.bms.receivable.service.IArBillService;
/** /**
* 应收账单导出异步任务执行器。 * 应收账单导出异步任务执行器。
@@ -1,4 +1,4 @@
package com.bms.ar.task; package com.bms.receivable.task;
import java.util.Date; import java.util.Date;
@@ -12,9 +12,9 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.event.TransactionPhase; import org.springframework.transaction.event.TransactionPhase;
import org.springframework.transaction.event.TransactionalEventListener; import org.springframework.transaction.event.TransactionalEventListener;
import com.bms.ar.domain.ArBillGenerateTask; import com.bms.receivable.domain.ArBillGenerateTask;
import com.bms.ar.event.ArBillGenerateTaskEvent; import com.bms.receivable.event.ArBillGenerateTaskEvent;
import com.bms.ar.service.IArBillService; import com.bms.receivable.service.IArBillService;
/** /**
* 应收账单异步生成任务调度器。 * 应收账单异步生成任务调度器。
@@ -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 != ''"> <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') and date_format(w.writeoff_date,'%y%m%d') &lt;= date_format(#{query.params.endTime},'%y%m%d')
</if> </if>
<include refid="com.bms.ar.mapper.ArBillScopeMapper.billScope"/> <include refid="com.bms.receivable.mapper.ArBillScopeMapper.billScope"/>
</where> </where>
order by w.create_time desc, w.writeoff_id desc order by w.create_time desc, w.writeoff_id desc
</select> </select>
@@ -102,7 +102,7 @@
inner join ar_bill_detail d on d.detail_id = f.detail_id inner join ar_bill_detail d on d.detail_id = f.detail_id
where d.ar_bill_id = #{arBillId} where d.ar_bill_id = #{arBillId}
and f.detail_id = #{detailId} 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 order by f.fee_no, f.detail_fee_id
</select> </select>
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
product_code, product_name, goods_description, country_code, country_name, dest_postcode, 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, 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 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 order by detail_no
</select> </select>
@@ -74,7 +74,7 @@
where create_by = #{createBy} where create_by = #{createBy}
and status in ('WAITING', 'RUNNING', 'CANCEL_REQUESTED') 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 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 order by create_time desc, task_id desc
</select> </select>
@@ -51,7 +51,7 @@
</if> </if>
<if test="query.requestId != null and query.requestId != ''">and l.request_id = #{query.requestId}</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> <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> </where>
order by l.create_time desc, l.log_id desc order by l.create_time desc, l.log_id desc
</select> </select>
@@ -39,7 +39,7 @@
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </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="totalAmount" column="total_amount"/>
<result property="writtenOffAmount" column="written_off_amount"/> <result property="writtenOffAmount" column="written_off_amount"/>
<result property="unwrittenAmount" column="unwritten_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.billDateStart != null">and bill_date &gt;= #{query.billDateStart}</if>
<if test="query.billDateEnd != null">and bill_date &lt;= #{query.billDateEnd}</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> <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> </where>
</sql> </sql>
@@ -132,7 +132,7 @@
<select id="selectArBillByIdScoped" resultMap="ArBillResult"> <select id="selectArBillByIdScoped" resultMap="ArBillResult">
select b.* from ar_bill b where b.ar_bill_id = #{arBillId} 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>
<select id="selectArBillByBillNo" parameterType="string" resultMap="ArBillResult"> <select id="selectArBillByBillNo" parameterType="string" resultMap="ArBillResult">
@@ -172,7 +172,7 @@
and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF') and status in ('CONFIRMED', 'PARTIAL_WRITTEN_OFF')
and (generation_status is null or generation_status = 'READY') and (generation_status is null or generation_status = 'READY')
and unwritten_amount &gt; 0 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 order by bill_date asc, ar_bill_id asc
</select> </select>
@@ -35,7 +35,7 @@
<when test="scope != null and scope.all"/> <when test="scope != null and scope.all"/>
<otherwise> <otherwise>
AND EXISTS (SELECT 1 FROM ctr_customer c WHERE c.customer_id = b.customer_id 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> </otherwise>
</choose> </choose>
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!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"> <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"/> <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="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="rate" column="rate"/><result property="effectiveAt" column="effective_at"/>
<result property="createBy" column="create_by"/><result property="remark" column="remark"/> <result property="createBy" column="create_by"/><result property="remark" column="remark"/>
</resultMap> </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"/> <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="billNo" column="bill_no"/><result property="customerName" column="customer_name"/>
<result property="salesUserId" column="sales_user_id"/><result property="salesUserName" column="sales_user_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="status" column="status"/><result property="confirmedBy" column="confirmed_by"/>
<result property="confirmedTime" column="confirmed_time"/><result property="remark" column="confirm_remark"/> <result property="confirmedTime" column="confirmed_time"/><result property="remark" column="confirm_remark"/>
</resultMap> </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"/> <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="detailId" column="detail_id"/><result property="billNo" column="bill_no"/>
<result property="orderNo" column="order_no"/><result property="salesUserName" column="sales_user_name"/> <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="salesUserId" column="sales_user_id"/><result property="weightedRate" column="weighted_rate"/>
<result property="billAmount" column="bill_amount"/> <result property="billAmount" column="bill_amount"/>
</resultMap> </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="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="currency" column="currency"/><result property="orderCount" column="order_count"/>
<result property="pendingCount" column="pending_count"/><result property="commissionAmount" column="commission_amount"/> <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} where sales_user_id = #{salesUserId} and effective_at &lt;= #{at}
order by effective_at desc, rate_id desc limit 1 for update order by effective_at desc, rate_id desc limit 1 for update
</select> </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) insert into ar_profit_commission_rate(sales_user_id, rate, effective_at, create_by, create_time, remark)
values(#{salesUserId}, #{rate}, #{effectiveAt}, #{createBy}, sysdate(), #{remark}) values(#{salesUserId}, #{rate}, #{effectiveAt}, #{createBy}, sysdate(), #{remark})
</insert> </insert>
@@ -104,7 +104,7 @@
<otherwise>and r.result_status != 'REVERSED' and b.status = 'WRITTEN_OFF' and b.generation_status = 'READY'</otherwise> <otherwise>and r.result_status != 'REVERSED' and b.status = 'WRITTEN_OFF' and b.generation_status = 'READY'</otherwise>
</choose> </choose>
<if test="billId != null">and r.ar_bill_id = #{billId}</if> <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 order by r.result_id desc
</select> </select>
<select id="selectCommissionSummary" resultMap="commissionSummary"> <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 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' 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> <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 group by r.sales_user_id, r.currency
order by sales_user_name, r.currency order by sales_user_name, r.currency
</select> </select>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?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"> <!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"> <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"/> <id property="arBillId" column="ar_bill_id"/>
<result property="billNo" column="bill_no"/><result property="billName" column="bill_name"/> <result property="billNo" column="bill_no"/><result property="billName" column="bill_name"/>
<result property="billDate" column="bill_date"/> <result property="billDate" column="bill_date"/>
@@ -13,19 +13,19 @@
<result property="salesGrossMarginRate" column="sales_gross_margin_rate"/> <result property="salesGrossMarginRate" column="sales_gross_margin_rate"/>
<result property="writtenOffAmount" column="written_off_amount"/><result property="unwrittenAmount" column="unwritten_amount"/> <result property="writtenOffAmount" column="written_off_amount"/><result property="unwrittenAmount" column="unwritten_amount"/>
</resultMap> </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="currency" column="currency"/><result property="billCount" column="bill_count"/>
<result property="salesAmount" column="sales_amount"/><result property="productAmount" column="product_amount"/> <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="salesGrossProfit" column="sales_gross_profit"/><result property="salesGrossMarginRate" column="sales_gross_margin_rate"/>
<result property="commissionAmount" column="commission_amount"/> <result property="commissionAmount" column="commission_amount"/>
<result property="writtenOffAmount" column="written_off_amount"/><result property="unwrittenAmount" column="unwritten_amount"/> <result property="writtenOffAmount" column="written_off_amount"/><result property="unwrittenAmount" column="unwritten_amount"/>
</resultMap> </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"/> <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="productName" column="product_name"/><result property="currency" column="currency"/>
<result property="totalAmount" column="total_amount"/> <result property="totalAmount" column="total_amount"/>
</resultMap> </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"/> <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="feeName" column="fee_name"/><result property="feeType" column="fee_type"/>
<result property="amount" column="amount"/><result property="productAmount" column="product_amount"/> <result property="amount" column="amount"/><result property="productAmount" column="product_amount"/>
@@ -133,7 +133,7 @@
) commission on commission.currency = t.currency ) commission on commission.currency = t.currency
group by t.currency order by t.currency group by t.currency order by t.currency
</select> </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 select u.user_id as userId, u.nick_name as name, u.user_name as code
from sys_user u from sys_user u
where u.del_flag = '0' and u.status = '0' where u.del_flag = '0' and u.status = '0'