From f389d18a3fe83a01699afdb3a1b693e438324f87 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 18 Jul 2024 09:39:36 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=20=E5=A4=9A=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayPackCompanyProjectServiceImpl.java     | 85 ++++++++++---------
 1 file changed, 45 insertions(+), 40 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
index f9edca11..7b12b0d4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/service/impl/PayPackCompanyProjectServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.pack.service.impl;
 
+import cn.hutool.core.thread.ThreadUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -53,6 +54,8 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -399,36 +402,36 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
         LambdaQueryWrapper<PayPackCompanyProject> wrapper1 = new LambdaQueryWrapper<>();
         wrapper1.in(PayPackCompanyProject::getPackId,packCompanyIdList);
         List<PayPackCompanyProject> list = this.list(wrapper1);
+        ExecutorService fixedThreadPool = ThreadUtil.newExecutor(10);
         for (PayPackCompanyProject project : list) {
-            String projectId = project.getProjectId();
-            Integer projectType = project.getProjectType();
-
-            switch (projectType.toString()){
+            fixedThreadPool.submit(() -> {
+                String projectId = project.getProjectId();
+                String projectType = project.getProjectType().toString();
                 // 普通项目
-                case PayIncomeContractCommon.PROJECT_TYPE1:
+                if (PayIncomeContractCommon.PROJECT_TYPE1.equals(projectType)){
                     PayCommonProject old = payCommonProjectMapper.selectById(projectId);
                     if (old == null) {
                         throw new JeroBootException("项目不存在");
                     }
-                    if (!new BigDecimal("0.00").equals(old.getReceivableAmount())){
-                        continue;
+                    if (!new BigDecimal("0.00").equals(old.getReceivableAmount())) {
+                        return;
                     }
                     PayCommonProject payCommonProject = null;
                     //普通项目管理-添加
                     List<JSONObject> jsonObjects = sysBaseAPI.getLogByRequestParam(projectId);
-                    if (jsonObjects.isEmpty()){
-                        continue;
+                    if (jsonObjects.isEmpty()) {
+                        return;
                     }
                     for (JSONObject jsonObject : jsonObjects) {
                         String logContent = jsonObject.getString("logContent");
-                        if ("普通项目管理-添加".equals(logContent)){
+                        if ("普通项目管理-添加".equals(logContent)) {
                             String requestParam = jsonObject.getString("requestParam");
-                            requestParam = requestParam.substring(1,requestParam.length()-1);
+                            requestParam = requestParam.substring(1, requestParam.length() - 1);
                             payCommonProject = JSONObject.parseObject(requestParam, PayCommonProject.class);
                         }
                     }
                     if (payCommonProject == null) {
-                        continue;
+                        return;
                     }
                     PayCommonProject project1 = new PayCommonProject();
                     project1.setId(projectId);
@@ -436,35 +439,34 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                     project1.setNoTaxAmount(payCommonProject.getNoTaxAmount());
                     project1.setTax(payCommonProject.getTax());
                     payCommonProjectMapper.updateById(project1);
-                    break;
-                // 工作组项目
-                case PayIncomeContractCommon.PROJECT_TYPE2:
+                }else if (PayIncomeContractCommon.PROJECT_TYPE2.equals(projectType)){
+                    // 工作组项目
                     //工作组成员-修改 工作组成员-添加
                     PayWorkingGroupSubItem old1 = payWorkingGroupSubItemMapper.selectById(projectId);
                     if (old1 == null) {
                         throw new JeroBootException("项目不存在");
                     }
-                    if (!new BigDecimal("0.00").equals(old1.getReceivableAmount())){
-                        continue;
+                    if (!new BigDecimal("0.00").equals(old1.getReceivableAmount())) {
+                        return;
                     }
                     String workingGroupId = old1.getWorkingGroupId();
                     PayWorkingGroup payWorkingGroup = payWorkingGroupMapper.selectById(workingGroupId);
                     BigDecimal yearChargeA = payWorkingGroup.getYearChargeA();
-                    if (yearChargeA == null || new BigDecimal("0.00").equals(yearChargeA)){
+                    if (yearChargeA == null || new BigDecimal("0.00").equals(yearChargeA)) {
                         yearChargeA = new BigDecimal("0.00");
                     }
                     PayWorkingGroupSubItem payWorking = null;
                     List<JSONObject> jsonObjects1 = sysBaseAPI.getLogByRequestParam(projectId);
                     for (JSONObject jsonObject : jsonObjects1) {
                         String logContent = jsonObject.getString("logContent");
-                        if ("工作组成员-添加".equals(logContent)||"工作组成员-修改".equals(logContent)||"企业端-工作组成员-修改".equals(logContent)){
+                        if ("工作组成员-添加".equals(logContent) || "工作组成员-修改".equals(logContent) || "企业端-工作组成员-修改".equals(logContent)) {
                             String requestParam = jsonObject.getString("requestParam");
-                            requestParam = requestParam.substring(1,requestParam.length()-1);
+                            requestParam = requestParam.substring(1, requestParam.length() - 1);
                             PayWorkingGroupSubItem obj = JSONObject.parseObject(requestParam, PayWorkingGroupSubItem.class);
                             BigDecimal receivableAmount = obj.getReceivableAmount();
-                            if (new BigDecimal("0.00").equals(receivableAmount) || receivableAmount == null){
-                                continue;
-                            }else {
+                            if (new BigDecimal("0.00").equals(receivableAmount) || receivableAmount == null) {
+                                return;
+                            } else {
                                 payWorking = obj;
                             }
                         }
@@ -479,7 +481,7 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                         project2.setNoTaxAmount(noTaxAmount);
                         project2.setTax(yearChargeA.subtract(noTaxAmount));
                         payWorkingGroupSubItemMapper.updateById(project2);
-                    }else {
+                    } else {
                         PayWorkingGroupSubItem project2 = new PayWorkingGroupSubItem();
                         project2.setId(projectId);
                         project2.setReceivableAmount(payWorking.getReceivableAmount());
@@ -487,15 +489,14 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                         project2.setTax(payWorking.getTax());
                         payWorkingGroupSubItemMapper.updateById(project2);
                     }
-                    break;
-                //会员项目
-                case PayIncomeContractCommon.PROJECT_TYPE4:
+                }else if (PayIncomeContractCommon.PROJECT_TYPE4.equals(projectType)){
+                    //会员项目
                     PayMemberProjectSubitem old2 = payMemberProjectSubitemMapper.selectById(projectId);
                     if (old2 == null) {
                         throw new JeroBootException("项目不存在");
                     }
-                    if (!new BigDecimal("0.00").equals(old2.getAmountReceivable())){
-                        continue;
+                    if (!new BigDecimal("0.00").equals(old2.getAmountReceivable())) {
+                        return;
                     }
                     String memberProjectId = old2.getProjectId();
                     PayMemberProject memberProject = payMemberProjectService.getById(memberProjectId);
@@ -506,22 +507,21 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                     member.setNoTaxAmount(noTaxAmount);
                     member.setTax(memberProject.getChargeStandard().subtract(noTaxAmount));
                     payMemberProjectSubitemMapper.updateById(member);
-                    break;
-                //标协会员
-                case PayIncomeContractCommon.PROJECT_TYPE5:
+                }else if (PayIncomeContractCommon.PROJECT_TYPE5.equals(projectType)){
+                    //标协会员
                     TbMemberProjectSubitem old3 = tbMemberProjectSubitemMapper.selectById(projectId);
                     if (old3 == null) {
                         throw new JeroBootException("项目不存在");
                     }
-                    if (!new BigDecimal("0.00").equals(old3.getAmountReceivable())){
-                        continue;
+                    if (!new BigDecimal("0.00").equals(old3.getAmountReceivable())) {
+                        return;
                     }
                     TbMemberProjectSubitem tbMember = new TbMemberProjectSubitem();
                     Integer memberNature = old3.getMemberNature();
                     BigDecimal amountReceivable = null;
-                    if (memberNature.equals(1)){
+                    if (memberNature.equals(1)) {
                         amountReceivable = new BigDecimal("5000");
-                    }else {
+                    } else {
                         amountReceivable = new BigDecimal("2000");
                     }
                     tbMember.setId(projectId);
@@ -530,10 +530,15 @@ public class PayPackCompanyProjectServiceImpl extends ServiceImpl<PayPackCompany
                     tbMember.setNoTaxAmount(noTaxAmount1);
                     tbMember.setTax(amountReceivable.subtract(noTaxAmount1));
                     tbMemberProjectSubitemMapper.updateById(tbMember);
-                    break;
-                default:
-            }
+                }
+            });
         }
-
+        //if (!fixedThreadPool.isShutdown()) {
+        //    fixedThreadPool.shutdown();
+        //}
+        //try {
+        //    fixedThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
+        //} catch (InterruptedException e) {
+        //}
     }
 }