md

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

@@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service.impl;
 
 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;
@@ -74,12 +75,16 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
     @Async
     @Override
     public void autoDoProfit() {
+
+        Map<String,Map<String,String> >  profitMap = new HashMap<>();
         // 获取需要出账的运单列表
         EmisWaybill qEmisWaybill = new EmisWaybill();
         List<EmisWaybill> list = emisWaybillMapper.selectWaitDoProfitList(qEmisWaybill);
 
         // 多线程并发处理
         if(!CollectionUtil.isEmpty(list)){
+
+
             List<List<EmisWaybill> > mutiOrderList = ListUtils.partition(list, 100);
             int realGroupSize=mutiOrderList.size();
 
@@ -99,6 +104,10 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
 
             try {
                 latch.await(300, TimeUnit.SECONDS);
+
+                // 线程结束后计算所有员工提成
+                reCalcEmpProfitSumMoney(null,null);
+
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }finally {
@@ -163,7 +172,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
     @Transactional
     public void reCalcProfitByBillCode(String billCode)
     {
-
         String lockKey="reCalcProfitByBillCode"+billCode;
         // 加锁查询
         log.error("reCalcProfitByBillCode start:"+billCode);
@@ -221,7 +229,6 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                 else if (postTypeIndex == ProfitPostType.DZ_EMP.typeCode) {
                     calcDzProfit(waybill);
                 }
-
             }
 
             // 运单打上已计算提成标记
@@ -236,6 +243,11 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
     }
 
     private int reCalcEmpProfitSumMoney(String empName,String billMonth){
+        String lockKey="reCalcEmpProfitSumMoney_"+empName+billMonth;
+        // 加锁查询
+        log.error("reCalcEmpProfitSumMoney start:"+empName+billMonth);
+        redissonService.lock(lockKey, 300);
+        try {
             // 获取统计数据
             List<EmisCommissionProfit> listProfit=emisCommissionProfitMapper.selectProfitStatList(empName,billMonth);
             for (EmisCommissionProfit profitItem:listProfit) {
@@ -249,6 +261,12 @@ public class EmisCommissionProfitServiceImpl extends EmisBaseService implements
                     emisCommissionProfitMapper.insertEmisCommissionProfit(profitItem);
                 }
             }
+        }catch (Exception ex){
+            redissonService.unlock(lockKey);
+            ex.printStackTrace();
+        }
+        redissonService.unlock(lockKey);
+        log.error("reCalcProfitByBillCode end:"+empName+billMonth);
         return 1;
     }
 

emis-biz/src/main/resources/mapper/EmisCommissionProfitMapper.xml

@@ -32,11 +32,13 @@
     <select id="selectProfitStatList" parameterType="String" resultMap="EmisCommissionProfitResult">
         select emp_name ,bill_month, sum(money) as money
         from emis_commission_dtl a
-        where a.emp_name = #{empName}
+        where del_flag='0'
+        <if test="empName != null  and empName != ''">
+            a.emp_name = #{empName}
+        </if>
         <if test="billMonth != null  and billMonth != ''">
          and bill_month=#{billMonth}
          </if>
-
         group by emp_name,bill_month
     </select>