From c96575413dd816b2d10de164e1aa825ca1c99c87 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 14 Nov 2023 13:47:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=A7=A3=E5=86=B3=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=BB=84=E6=88=90=E5=91=98=E5=A4=8D=E5=88=B6=E5=90=8E=E7=A8=8E?=
 =?UTF-8?q?=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayWorkingGroupController.java       |  1 +
 .../service/impl/PayWorkingGroupServiceImpl.java    | 13 ++++++++++++-
 .../impl/PayWorkingGroupSubItemServiceImpl.java     |  9 +++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index ede3e42b..1b125983 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -241,6 +241,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 	  * @param payWorkingGroup 工作组项目
 	  * @return
 	  */
+	 @AutoLog(value = "工作组项目-复制",operateType = 2)
 	 @RequiresPermissions("workingGroupProject:copy")
 	 @ApiOperation(value="工作组项目-复制", notes="工作组项目-复制")
 	 @PostMapping(value = "/copy")
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
index a73495fd..c056dea1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupServiceImpl.java
@@ -17,6 +17,7 @@ import com.jero.common.service.RolePermissionService;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayContactsManagementService;
+import com.jero.config.StaticConfig;
 import com.jero.contract.entity.PayIncomeContractAssociated;
 import com.jero.contract.service.IPayIncomeContractAssociatedService;
 import com.jero.modules.system.entity.SysUser;
@@ -44,6 +45,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -298,10 +300,19 @@ public class PayWorkingGroupServiceImpl extends ServiceImpl<PayWorkingGroupMappe
                 p.setCreateTime(null);
                 p.setUpdateBy(null);
                 p.setUpdateTime(null);
-                if(!Objects.isNull(p.getReceivableAmount()) && p.getReceivableAmount().compareTo(new BigDecimal("0")) > 0){
+                BigDecimal receivableAmount = p.getReceivableAmount();
+                if(!Objects.isNull(receivableAmount) && receivableAmount.compareTo(new BigDecimal("0")) > 0){
                     p.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);
+                    BigDecimal noTaxAmount = receivableAmount.divide(StaticConfig.TAX_RATE_CALCULATE, 2, RoundingMode.HALF_UP);
+                    BigDecimal tax = receivableAmount.subtract(noTaxAmount);
+                    p.setTaxRate(StaticConfig.TAX_RATE);
+                    p.setNoTaxAmount(noTaxAmount);
+                    p.setTax(tax);
                 }else{
                     p.setPaymentStatus(null);
+                    p.setTaxRate(StaticConfig.TAX_RATE);
+                    p.setNoTaxAmount(BigDecimal.ZERO);
+                    p.setTax(BigDecimal.ZERO);
                 }
 
                 p.setWorkingGroupId(payWorkingGroupOld.getId());
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
index dab07c73..4973dc40 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupSubItemServiceImpl.java
@@ -24,6 +24,7 @@ import com.jero.company.entity.PayCompanyManagement;
 import com.jero.company.entity.PayContactsManagement;
 import com.jero.company.service.IPayCompanyManagementService;
 import com.jero.company.service.IPayContactsManagementService;
+import com.jero.config.StaticConfig;
 import com.jero.contract.entity.PayIncomeContract;
 import com.jero.contract.entity.PayIncomeContractAssociated;
 import com.jero.contract.service.IPayIncomeContractAssociatedService;
@@ -69,6 +70,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -429,6 +431,13 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
         payWorkingGroupSubItem.setPaymentStatus(paymentStatus);
         payWorkingGroupSubItem.setInAccount(null);
         payWorkingGroupSubItem.setPaidAmount(null);
+
+        BigDecimal taxRate = payWorkingGroupSubItem.getTaxRate();
+        BigDecimal receivableAmount = payWorkingGroupSubItem.getReceivableAmount();
+        BigDecimal noTaxAmount = receivableAmount.divide(taxRate.add(BigDecimal.ONE), 2, RoundingMode.HALF_UP);
+        BigDecimal tax = receivableAmount.subtract(noTaxAmount);
+        payWorkingGroupSubItem.setNoTaxAmount(noTaxAmount);
+        payWorkingGroupSubItem.setTax(tax);
         payWorkingGroupSubItemService.updateById(payWorkingGroupSubItem);
         LambdaUpdateWrapper<PayWorkingGroupSubItem> updatePayWorkingGroupSubItem = new LambdaUpdateWrapper<>();
         updatePayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getId, workingGroupSubItemId);