From db9c5801666568ed351712ae02a04912589785c3 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 20 Mar 2026 09:17:05 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=BF=9B=E4=BB=93=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/EmisCommissionProfitServiceImpl.java | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

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 70cc43c01..64d0ffd44 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
@@ -10,33 +10,34 @@
 
 package com.xdadan.erp.emis.service.impl;
 
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+ import cn.hutool.core.collection.CollectionUtil;
+ import com.alibaba.fastjson.JSONObject;
+ import com.googlecode.aviator.AviatorEvaluator;
+ import com.xdadan.erp.common.core.domain.entity.SysUser;
+ import com.xdadan.erp.common.core.redis.RedissonService;
+ import com.xdadan.erp.common.utils.DateUtils;
+ import com.xdadan.erp.emis.domain.*;
+ import com.xdadan.erp.emis.domain.enumtype.ProfitPostType;
+ import com.xdadan.erp.emis.mapper.*;
+ import com.xdadan.erp.emis.service.EmisBaseService;
+ import com.xdadan.erp.emis.service.IEmisCommissionProfitService;
+ import com.xdadan.erp.emis.utils.WaybillHelper;
+ import jodd.util.StringUtil;
+ import lombok.extern.slf4j.Slf4j;
+ import org.apache.commons.collections4.ListUtils;
+ import org.apache.commons.lang3.StringUtils;
+ import org.springframework.beans.factory.annotation.Autowired;
+ import org.springframework.stereotype.Service;
+ import org.springframework.transaction.annotation.Transactional;
+ import org.springframework.util.CollectionUtils;
 
-import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.googlecode.aviator.AviatorEvaluator;
-import com.xdadan.erp.common.core.domain.entity.SysUser;
-import com.xdadan.erp.common.core.redis.RedissonService;
-import com.xdadan.erp.common.utils.DateUtils;
-import com.xdadan.erp.common.utils.DictUtils;
-import com.xdadan.erp.emis.domain.*;
-import com.xdadan.erp.emis.domain.enumtype.ProfitPostType;
-import com.xdadan.erp.emis.mapper.*;
-import com.xdadan.erp.emis.service.EmisBaseService;
-import com.xdadan.erp.emis.utils.WaybillHelper;
-import jodd.util.StringUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.ListUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.xdadan.erp.emis.service.IEmisCommissionProfitService;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
+ import java.math.BigDecimal;
+ import java.util.Date;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.concurrent.CountDownLatch;
+ import java.util.concurrent.TimeUnit;
 
  /**
  * 员工提成表Service业务层处理
@@ -92,7 +93,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
             long startTime=System.currentTimeMillis();
 
             for(int i=0; i<realGroupSize;i++){
-                Runnable doRunnable=new EmisCommissionProfitServiceImpl.MultiDoBillThread(
+                Runnable doRunnable=new MultiDoBillThread(
                         mutiOrderList.get(i),
                         latch,
                         "MultiDoBillThread==>"+i);
@@ -135,7 +136,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
             long startTime=System.currentTimeMillis();
 
             for(int i=0; i<realGroupSize;i++){
-                Runnable doRunnable=new EmisCommissionProfitServiceImpl.MultiDoBatchThread(
+                Runnable doRunnable=new MultiDoBatchThread(
                         mutiBatchList.get(i),
                         latch,
                         "MultiDoBatchThread==>"+i);
@@ -1351,7 +1352,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                         // 插入提成
                         if (BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO) > 0) {
                             // 新增：按销售分成配置插入多岗位提成
-                            String salesSupport = waybill.getSalesSupport();
+                            String salesSupport = null;
+                            if (waybill.getWaybillOther() != null) {
+                                salesSupport = waybill.getWaybillOther().getSalesSupport();
+                            }
 //                            String salesExecutive = waybill.getSalesExecutive();
                             boolean hasRatioInsert = false;
                             if (StringUtils.isNotEmpty(salesmen)) {