✨ 完善毛利分析筛选与导出日志

bms-back/bms-system/src/main/java/com/bms/price/service/IPrcProfitReportService.java

@@ -1,7 +1,8 @@
 package com.bms.price.service;
 
 import java.util.List;
-import com.bms.price.domain.PrcProfitCommissionRate;
+// 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate;
+import com.bms.price.domain.PrcProfitReportExport;
 import com.bms.price.domain.vo.PrcProfitReportOrderRow;
 import com.bms.price.domain.vo.PrcProfitReportProductRow;
 import com.bms.price.domain.vo.PrcProfitReportQuery;
@@ -16,9 +17,21 @@ public interface IPrcProfitReportService
 
     List<PrcProfitReportSummary> selectSummary(PrcProfitReportQuery query);
 
+    int createExport(PrcProfitReportExport export);
+
+    int completeExport(PrcProfitReportExport export);
+
+    int failExport(Long exportId, String remark);
+
+    List<PrcProfitReportExport> selectExports(String exportBy);
+
+    PrcProfitReportExport selectExport(Long exportId, String exportBy);
+
+    /* 提成比例维护暂停使用。
     List<PrcProfitCommissionRate> selectCommissionRates();
 
     void saveCommissionRate(PrcProfitCommissionRate rate);
 
     int deleteCommissionRate(Long rateId);
+    */
 }

bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java

@@ -3,15 +3,16 @@ package com.bms.price.service.impl;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.math.BigDecimal;
+// 提成功能暂停使用：import java.math.BigDecimal;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+// 提成功能暂停使用：import org.springframework.transaction.annotation.Transactional;
 import com.bms.common.annotation.DataScope;
 import com.bms.common.exception.ServiceException;
-import com.bms.common.utils.SecurityUtils;
-import com.bms.price.domain.PrcProfitCommissionRate;
-import com.bms.price.mapper.PrcProfitCommissionRateMapper;
+// 提成功能暂停使用：import com.bms.common.utils.SecurityUtils;
+// 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate;
+// 提成功能暂停使用：import com.bms.price.mapper.PrcProfitCommissionRateMapper;
+import com.bms.price.domain.PrcProfitReportExport;
 import com.bms.price.domain.vo.PrcProfitReportOrderRow;
 import com.bms.price.domain.vo.PrcProfitReportProductRow;
 import com.bms.price.domain.vo.PrcProfitReportQuery;
@@ -28,8 +29,10 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
     @Autowired
     private PrcProfitReportMapper profitReportMapper;
 
+    /* 提成配置依赖暂停使用。
     @Autowired
     private PrcProfitCommissionRateMapper commissionRateMapper;
+    */
 
     @Override
     @DataScope(deptAlias = "su", deptField = "dept_id", userAlias = "su", userField = "user_id", permission = "report:profit:list")
@@ -55,6 +58,36 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
         return profitReportMapper.selectSummary(query);
     }
 
+    @Override
+    public int createExport(PrcProfitReportExport export)
+    {
+        return profitReportMapper.insertExport(export);
+    }
+
+    @Override
+    public int completeExport(PrcProfitReportExport export)
+    {
+        return profitReportMapper.markExportSuccess(export);
+    }
+
+    @Override
+    public int failExport(Long exportId, String remark)
+    {
+        return profitReportMapper.markExportFailed(exportId, remark);
+    }
+
+    @Override
+    public List<PrcProfitReportExport> selectExports(String exportBy)
+    {
+        return profitReportMapper.selectExportsByUser(exportBy);
+    }
+
+    @Override
+    public PrcProfitReportExport selectExport(Long exportId, String exportBy)
+    {
+        return profitReportMapper.selectExportByIdAndUser(exportId, exportBy);
+    }
+
     /** 将报表的多行输入拆分为去重后的查询条件，支持换行、空格、逗号和分号分隔。 */
     private void normalizeMultiValueFilters(PrcProfitReportQuery query)
     {
@@ -62,6 +95,10 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
         {
             return;
         }
+        if ("COMMISSION_MISSING".equals(query.getDetailType()))
+        {
+            throw new ServiceException("提成功能已暂停使用");
+        }
         query.setOrderNos(splitFilterValues(query.getOrderNo(), "订单号"));
         query.setCustomerCodes(splitFilterValues(query.getCustomerCode(), "客户代码"));
         query.setCustomerNames(splitFilterValues(query.getCustomerName(), "客户名称"));
@@ -88,6 +125,7 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
         return new ArrayList<>(values);
     }
 
+    /* 提成比例查询、保存、删除暂停使用，保留原逻辑便于恢复。
     @Override
     public List<PrcProfitCommissionRate> selectCommissionRates()
     {
@@ -136,4 +174,5 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
         }
         return commissionRateMapper.deleteById(rateId);
     }
+    */
 }