✨ 合并毛利分析客户筛选并调整订单号输入高度

This commit is contained in:
caojia
2026-11-04 10:08:03 +08:00
parent f0012ac563
commit c6509fca51
5 changed files with 47 additions and 27 deletions
@@ -1,6 +1,7 @@
package com.bms.price.service;
import java.util.List;
import com.bms.customer.customerinfo.domain.BmsCustomerOption;
// 提成功能暂停使用:import com.bms.price.domain.PrcProfitCommissionRate;
import com.bms.price.domain.PrcProfitReportExport;
import com.bms.price.domain.vo.PrcProfitReportOrderRow;
@@ -11,6 +12,8 @@ import com.bms.price.domain.vo.PrcProfitReportSummary;
/** 毛利报表服务。 */
public interface IPrcProfitReportService
{
List<BmsCustomerOption> selectCustomerOptions(String keywords);
List<PrcProfitReportOrderRow> selectOrderRows(PrcProfitReportQuery query);
List<PrcProfitReportProductRow> selectProductRows(PrcProfitReportQuery query);
@@ -9,6 +9,9 @@ import org.springframework.stereotype.Service;
// 提成功能暂停使用:import org.springframework.transaction.annotation.Transactional;
import com.bms.common.exception.ServiceException;
import com.bms.common.utils.SecurityUtils;
import com.bms.customer.customerinfo.domain.BmsCustomer;
import com.bms.customer.customerinfo.domain.BmsCustomerOption;
import com.bms.customer.customerinfo.mapper.BmsCustomerMapper;
// 提成功能暂停使用:import com.bms.price.domain.PrcProfitCommissionRate;
// 提成功能暂停使用:import com.bms.price.mapper.PrcProfitCommissionRateMapper;
import com.bms.price.domain.PrcProfitReportExport;
@@ -28,11 +31,23 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
@Autowired
private PrcProfitReportMapper profitReportMapper;
@Autowired
private BmsCustomerMapper customerMapper;
/* 提成配置依赖暂停使用。
@Autowired
private PrcProfitCommissionRateMapper commissionRateMapper;
*/
@Override
public List<BmsCustomerOption> selectCustomerOptions(String keywords)
{
// 报表不应用客户模块的 DataScope,只接收关键字并构造内部查询条件。
BmsCustomer query = new BmsCustomer();
query.setKeywords(keywords);
return customerMapper.selectCustomerOptions(query);
}
@Override
public List<PrcProfitReportOrderRow> selectOrderRows(PrcProfitReportQuery query)
{