aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: 销售支持没有提成问题修复

Browse Source 
committer: heyu
This commit is contained in:
aike 2026-03-19 17:02:33 +08:00
parent fa0ae97dd8
commit d6ace38b88
1 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCommissionProfitServiceImpl.java
View File

@ -10,33 +10,34 @@
package com.xdadan.erp.emis.service.impl; package com.xdadan.erp.emis.service.impl;
import java.math.BigDecimal; import cn.hutool.core.collection.CollectionUtil;
import java.util.*; import com.alibaba.fastjson.JSONObject;
import java.util.concurrent.CountDownLatch; import com.googlecode.aviator.AviatorEvaluator;
import java.util.concurrent.TimeUnit; 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 java.math.BigDecimal;
import com.alibaba.fastjson.JSONObject; import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat; import java.util.HashMap;
import com.googlecode.aviator.AviatorEvaluator; import java.util.List;
import com.xdadan.erp.common.core.domain.entity.SysUser; import java.util.Map;
import com.xdadan.erp.common.core.redis.RedissonService; import java.util.concurrent.CountDownLatch;
import com.xdadan.erp.common.utils.DateUtils; import java.util.concurrent.TimeUnit;
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;
/** /**
* 员工提成表Service业务层处理 * 员工提成表Service业务层处理
@ -92,7 +93,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
long startTime=System.currentTimeMillis(); long startTime=System.currentTimeMillis();
for(int i=0; i<realGroupSize;i++){ for(int i=0; i<realGroupSize;i++){
Runnable doRunnable=new EmisCommissionProfitServiceImpl.MultiDoBillThread( Runnable doRunnable=new MultiDoBillThread(
mutiOrderList.get(i), mutiOrderList.get(i),
latch, latch,
"MultiDoBillThread==>"+i); "MultiDoBillThread==>"+i);
@ -135,7 +136,7 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
long startTime=System.currentTimeMillis(); long startTime=System.currentTimeMillis();
for(int i=0; i<realGroupSize;i++){ for(int i=0; i<realGroupSize;i++){
Runnable doRunnable=new EmisCommissionProfitServiceImpl.MultiDoBatchThread( Runnable doRunnable=new MultiDoBatchThread(
mutiBatchList.get(i), mutiBatchList.get(i),
latch, latch,
"MultiDoBatchThread==>"+i); "MultiDoBatchThread==>"+i);
@ -1351,7 +1352,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
// 插入提成 // 插入提成
if (BigDecimal.valueOf(profitMoney).compareTo(BigDecimal.ZERO) > 0) { 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(); // String salesExecutive = waybill.getSalesExecutive();
boolean hasRatioInsert = false; boolean hasRatioInsert = false;
if (StringUtils.isNotEmpty(salesmen)) { if (StringUtils.isNotEmpty(salesmen)) {