From 05bb3819c2ded5bfc9ad2a683612bf4fe48989a4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 2 Mar 2025 21:05:52 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/web/emis/EmisCommonController.java   | 4 ++--
 .../erp/emis/service/IEmisCommissionProfitService.java       | 5 +++--
 .../emis/service/impl/EmisCommissionProfitServiceImpl.java   | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
index 6ba92f832..cbfdd431d 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java
@@ -645,14 +645,14 @@ public class EmisCommonController extends EmisBaseController
      * @return
      */
     @GetMapping("/autoDoProfitTrigger")
-    public AjaxResult autoDoProfitTrigger(){
+    public AjaxResult autoDoProfitTrigger(EmisWaybill emisWaybill){
         String lockKey="autoDoProfitTrigger";
         log.info("autoDoProfitTrigger start");
 
         // 加锁查询
         redissonService.lock(lockKey,300);
         try{
-            emisCommissionProfitService.autoDoProfit();
+            emisCommissionProfitService.autoDoProfit(emisWaybill);
         }catch(Exception ex){
             ex.printStackTrace();
             log.error("autoDoProfitTrigger exception:"+ex.getMessage());
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 cb8fda2b4..2270b526b 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
@@ -11,8 +11,9 @@ package com.xdadan.erp.emis.service;
 
 import java.util.List;
 import com.xdadan.erp.emis.domain.EmisCommissionProfit;
+import com.xdadan.erp.emis.domain.EmisWaybill;
 
-/**
+ /**
  * @ClassName EmisCommissionProfitService
  * @Description 员工提成表
  * @author linfso
@@ -31,7 +32,7 @@ public interface IEmisCommissionProfitService
     /**
      * 自动计算提成
      */
-    public void autoDoProfit();
+    public void autoDoProfit(EmisWaybill emisWaybill);
 
 
     /**
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 ac34cc724..04f35b128 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
@@ -74,12 +74,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
      */
     @Async
     @Override
-    public void autoDoProfit() {
+    public void autoDoProfit(EmisWaybill emisWaybill) {
 
         Map<String,Map<String,String> >  profitMap = new HashMap<>();
         // 获取需要出账的运单列表
-        EmisWaybill qEmisWaybill = new EmisWaybill();
-        List<EmisWaybill> list = emisWaybillMapper.selectWaitDoProfitList(qEmisWaybill);
+        List<EmisWaybill> list = emisWaybillMapper.selectWaitDoProfitList(emisWaybill);
 
         // 多线程并发处理
         if(!CollectionUtil.isEmpty(list)){