From 1f85dec5a889afc16e3ef0707ab54d6387c6dd2e Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 16 Jul 2024 15:17:08 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9D=A5=E6=AC=BE=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=BA=E5=90=88=E5=90=8C=E6=89=93=E5=8C=85=E6=97=B6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/IPayMemberProjectSubitemService.java   |  6 ------
 .../service/ITbMemberProjectSubitemService.java    |  9 ---------
 .../service/impl/PayCommonProjectServiceImpl.java  |  6 ------
 .../impl/PayWorkingGroupSubItemServiceImpl.java    | 14 --------------
 4 files changed, 35 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
index b52cd6c4..8da6e752 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/IPayMemberProjectSubitemService.java
@@ -122,9 +122,6 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
 					LambdaUpdateWrapper<PayMemberProjectSubitem> update = new LambdaUpdateWrapper<>();
 					update.eq(PayMemberProjectSubitem::getId,payMemberProjectSubitem.getId());
 					update.set(PayMemberProjectSubitem::getPack,PayProjectCommon.PACKAGING1);
-					update.set(PayMemberProjectSubitem::getAmountReceivable,BigDecimal.ZERO);
-					update.set(PayMemberProjectSubitem::getTax,BigDecimal.ZERO);
-					update.set(PayMemberProjectSubitem::getNoTaxAmount,BigDecimal.ZERO);
 					update(update);
 				}
 			}
@@ -197,9 +194,6 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
 			// 关联了合同,判断合同是否打包，更新项目打包状态，添加打包
 			if(!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(),PayProjectCommon.PACKAGING1)){
 				payPackCompanyProjectService.setPack(payMemberProjectSubitem.getCompanyId(),payMemberProjectSubitem.getCompanyContactId(),payIncomeContractAdd.getPackYear(),payMemberProjectSubitem.getId(),PayProjectCommon.PROJECT_TYPE4,payIncomeContractAdd.getPack());
-				payMemberProjectSubitem.setAmountReceivable(BigDecimal.ZERO);
-				payMemberProjectSubitem.setTax(BigDecimal.ZERO);
-				payMemberProjectSubitem.setNoTaxAmount(BigDecimal.ZERO);
 			}
 		}
 		//无法更改状态
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
index 019f1da0..b0eac033 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
@@ -191,9 +191,6 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 					LambdaUpdateWrapper<TbMemberProjectSubitem> update = new LambdaUpdateWrapper<>();
 					update.eq(TbMemberProjectSubitem::getId, tbMemberProjectSubitem.getId());
 					update.set(TbMemberProjectSubitem::getPack, PayProjectCommon.PACKAGING1);
-					update.set(TbMemberProjectSubitem::getAmountReceivable,BigDecimal.ZERO);
-					update.set(TbMemberProjectSubitem::getTax,BigDecimal.ZERO);
-					update.set(TbMemberProjectSubitem::getNoTaxAmount,BigDecimal.ZERO);
 					tbMemberProjectSubitemService.update(update);
 				}
 			}
@@ -371,9 +368,6 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 					LambdaUpdateWrapper<TbMemberProjectSubitem> update = new LambdaUpdateWrapper<>();
 					update.eq(TbMemberProjectSubitem::getId, tbMemberProjectSubitem.getId());
 					update.set(TbMemberProjectSubitem::getPack, PayProjectCommon.PACKAGING1);
-					update.set(TbMemberProjectSubitem::getAmountReceivable,BigDecimal.ZERO);
-					update.set(TbMemberProjectSubitem::getTax,BigDecimal.ZERO);
-					update.set(TbMemberProjectSubitem::getNoTaxAmount,BigDecimal.ZERO);
 					tbMemberProjectSubitemService.update(update);
 				}
 			}
@@ -442,9 +436,6 @@ public class ITbMemberProjectSubitemService extends ServiceImpl<TbMemberProjectS
 			if (!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(), PayProjectCommon.PACKAGING1)) {
 				String liaisonManId = tbMemberProjectSubitem.getLiaisonManId();
 				payPackCompanyProjectService.setPack(companyId, liaisonManId, payIncomeContractAdd.getPackYear(), subitemId, PayProjectCommon.PROJECT_TYPE5, payIncomeContractAdd.getPack());
-				tbMemberProjectSubitem.setAmountReceivable(BigDecimal.ZERO);
-				tbMemberProjectSubitem.setTax(BigDecimal.ZERO);
-				tbMemberProjectSubitem.setNoTaxAmount(BigDecimal.ZERO);
 			}
 		}
     	updateById(tbMemberProjectSubitem);
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
index cd5679f9..22f2d62d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayCommonProjectServiceImpl.java
@@ -132,9 +132,6 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
                     LambdaUpdateWrapper<PayCommonProject> update = new LambdaUpdateWrapper<>();
                     update.eq(PayCommonProject::getId,payCommonProject.getId());
                     update.set(PayCommonProject::getPack,PayProjectCommon.PACKAGING1);
-                    update.set(PayCommonProject::getReceivableAmount,BigDecimal.ZERO);
-                    update.set(PayCommonProject::getTax,BigDecimal.ZERO);
-                    update.set(PayCommonProject::getNoTaxAmount,BigDecimal.ZERO);
                     payCommonProjectService.update(update);
                 }
             }
@@ -228,9 +225,6 @@ public class PayCommonProjectServiceImpl extends ServiceImpl<PayCommonProjectMap
             if(!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(),PayProjectCommon.PACKAGING1)){
                 payPackCompanyProjectService.setPack(payCommonProject.getChargeCompanyId(),payCommonProject.getContactsId(),payIncomeContractAdd.getPackYear(),payCommonProject.getId(),PayProjectCommon.PROJECT_TYPE1,payIncomeContractAdd.getPack());
                 payCommonProject.setPack(PayProjectCommon.PACKAGING1);
-                payCommonProject.setReceivableAmount(BigDecimal.ZERO);
-                payCommonProject.setTax(BigDecimal.ZERO);
-                payCommonProject.setNoTaxAmount(BigDecimal.ZERO);
             }
         }
 
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 cf651e69..40b4268a 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
@@ -273,9 +273,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                     LambdaUpdateWrapper<PayWorkingGroupSubItem> update = new LambdaUpdateWrapper<>();
                     update.eq(PayWorkingGroupSubItem::getId, payWorkingGroupSubItem.getId());
                     update.set(PayWorkingGroupSubItem::getPack, PayProjectCommon.PACKAGING1);
-                    update.set(PayWorkingGroupSubItem::getReceivableAmount,BigDecimal.ZERO);
-                    update.set(PayWorkingGroupSubItem::getTax,BigDecimal.ZERO);
-                    update.set(PayWorkingGroupSubItem::getNoTaxAmount,BigDecimal.ZERO);
                     payWorkingGroupSubItemService.update(update);
                 }
             }
@@ -409,10 +406,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             if (!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(), PayProjectCommon.PACKAGING1)) {
                 String masterContactsId = payWorkingGroupSubItemContactsMapper.getMasterContactsId(workingGroupSubItemId);
                 payPackCompanyProjectService.setPack(payWorkingGroupSubItem.getChargeCompanyId(), masterContactsId, payIncomeContractAdd.getPackYear(), workingGroupSubItemId, PayProjectCommon.PROJECT_TYPE2, payIncomeContractAdd.getPack());
-
-                payWorkingGroupSubItem.setReceivableAmount(BigDecimal.ZERO);
-                payWorkingGroupSubItem.setTax(BigDecimal.ZERO);
-                payWorkingGroupSubItem.setNoTaxAmount(BigDecimal.ZERO);
             }
         }
         LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
@@ -586,10 +579,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
             if (!Objects.isNull(payIncomeContractAdd) && Objects.equals(payIncomeContractAdd.getPack(), PayProjectCommon.PACKAGING1)) {
                 String masterContactsId = payWorkingGroupSubItemContactsMapper.getMasterContactsId(workingGroupSubItemId);
                 payPackCompanyProjectService.setPack(payWorkingGroupSubItem.getChargeCompanyId(), masterContactsId, payIncomeContractAdd.getPackYear(), workingGroupSubItemId, PayProjectCommon.PROJECT_TYPE2, payIncomeContractAdd.getPack());
-
-                payWorkingGroupSubItem.setReceivableAmount(BigDecimal.ZERO);
-                payWorkingGroupSubItem.setTax(BigDecimal.ZERO);
-                payWorkingGroupSubItem.setNoTaxAmount(BigDecimal.ZERO);
             }
         }
         LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
@@ -936,9 +925,6 @@ public class PayWorkingGroupSubItemServiceImpl extends ServiceImpl<PayWorkingGro
                                     LambdaUpdateWrapper<PayWorkingGroupSubItem> update = new LambdaUpdateWrapper<>();
                                     update.eq(PayWorkingGroupSubItem::getId, workingGroupSubItemId);
                                     update.set(PayWorkingGroupSubItem::getPack, PayProjectCommon.PACKAGING1);
-                                    update.set(PayWorkingGroupSubItem::getReceivableAmount,BigDecimal.ZERO);
-                                    update.set(PayWorkingGroupSubItem::getTax,BigDecimal.ZERO);
-                                    update.set(PayWorkingGroupSubItem::getNoTaxAmount,BigDecimal.ZERO);
                                     payWorkingGroupSubItemService.update(update);
                                 }
                             });