From ca204fac918cf16ef9e8821a6ba17e11a7cf9a05 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 14 Nov 2024 20:14:43 +0800
Subject: [PATCH] md

---
 .../emis/EmisCommissionProfitController.java  | 29 +++++++++++++++++--
 .../service/IEmisCommissionProfitService.java |  1 +
 .../impl/EmisCommissionProfitServiceImpl.java |  3 ++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
index b01546517..59cc4c063 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommissionProfitController.java
@@ -11,8 +11,12 @@
 
 package com.xdadan.erp.web.emis;
 
+import java.util.Arrays;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.xdadan.erp.emis.utils.WaybillHelper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,7 +33,6 @@ import com.xdadan.erp.common.core.controller.BaseController;
 import com.xdadan.erp.common.core.domain.AjaxResult;
 import com.xdadan.erp.common.core.page.TableDataInfo;
 import com.xdadan.erp.common.enums.BusinessType;
-import com.xdadan.erp.common.utils.StringUtils;
 import com.xdadan.erp.common.utils.poi.ExcelUtil;
 
 import com.xdadan.erp.emis.domain.EmisCommissionProfit;
@@ -48,6 +51,29 @@ public class EmisCommissionProfitController extends BaseController
     @Autowired
     private IEmisCommissionProfitService emisCommissionProfitService;
 
+
+    @GetMapping(value = "/batchReCalcProfitByBillCode")
+    public AjaxResult batchReCalcProfitByBillCode(String billCode)
+    {
+        if(!StringUtils.isEmpty(billCode)){
+            billCode=WaybillHelper.formatQueryValue(billCode);
+            String[] billCodeSortList = billCode.split(",");
+            if(billCodeSortList.length>1){
+                for (int i=0;i<billCodeSortList.length;i++){
+                    String subBillCode=billCodeSortList[i];
+                    try {
+                        emisCommissionProfitService.reCalcProfitByBillCode(subBillCode);
+                    }catch (Exception ex){
+                        return AjaxResult.error("计算失败-单号:["+subBillCode+"]");
+                    }
+                }
+            }
+            return AjaxResult.success("计算成功");
+        }else{
+            return AjaxResult.error("计算失败-单号不能为空");
+        }
+    }
+
     /**
      * 查询员工提成表列表
      */
@@ -60,7 +86,6 @@ public class EmisCommissionProfitController extends BaseController
         return getDataTable(list);
     }
 
-
      /**
      * 检查是否重复
      * 
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
index 890c00c3a..39538e0b6 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisCommissionProfitService.java
@@ -33,6 +33,7 @@ public interface IEmisCommissionProfitService
      */
     public void autoDoProfit();
 
+
     /**
      * 重新计算提成根据billCode
      * @param billCode
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
index 9ea80adcb..05f9419f2 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
@@ -26,7 +26,9 @@ import com.xdadan.erp.emis.mapper.EmisCommissionDtlMapper;
 import com.xdadan.erp.emis.mapper.EmisCommissionQuoteMapper;
 import com.xdadan.erp.emis.mapper.EmisWaybillMapper;
 import com.xdadan.erp.emis.service.EmisBaseService;
+import com.xdadan.erp.emis.utils.WaybillHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xdadan.erp.emis.mapper.EmisCommissionProfitMapper;
@@ -75,6 +77,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
         }
     }
 
+
     /**
      * 根据单号重新计算提成
      */