From 4369d9cae4c973e0749d1e6652c9598acef1e570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Fri, 15 Oct 2021 16:57:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40797?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/mail/service/impl/PayMailBillServiceImpl.java   | 9 +++++++--
 .../service/impl/PayPaymentRecordServiceImpl.java        | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
index 2a5bb564..1f88d1a7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/impl/PayMailBillServiceImpl.java
@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.common.common.ProjectCommon;
 import com.jero.common.exception.JeroBootException;
+import com.jero.common.service.ProjectDetailService;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.company.entity.PayCompanyManagement;
@@ -41,6 +42,7 @@ import com.jero.member.mapper.PayMemberProjectSubitemMapper;
 import com.jero.member.mapper.TbMemberProjectMapper;
 import com.jero.member.mapper.TbMemberProjectSubitemMapper;
 import com.jero.payment.entity.PayPaymentRecord;
+import com.jero.payment.service.IPayPaymentRecordService;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayWorkingGroup;
 import com.jero.project.entity.PayWorkingGroupSubItem;
@@ -53,6 +55,7 @@ import org.apache.commons.collections.CollectionUtils;
 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 javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -99,11 +102,13 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
     @Resource
     private PayMailBillProjectMapper payMailBillProjectMapper;
     @Resource
-    PayCompanyManagementMapper payCompanyManagementMapper;
+    private ProjectDetailService projectDetailService;
     @Resource
     private IPayCompanyManagementTemporaryService payCompanyManagementTemporaryService;
     @Resource
     private IPayCompanyManagementService payCompanyManagementService;
+    @Resource
+    private IPayPaymentRecordService payPaymentRecordService;
 
 
     @Override
@@ -136,6 +141,7 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
      * @param payMailBill
      * @return
      */
+    @Transactional
     public Result<?> addPayBill(PayMailBillVO payMailBill) {
         //票据关联项目表
         List<PayMailBillProject> bmpList = payMailBill.getBmpList();
@@ -146,7 +152,6 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
             return Result.error(res);
         }
 
-
         for (int i = 0; i < bmpList.size(); i++) {
             PayMailBillProject payMailBillProject = bmpList.get(i);
             if (PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(payMailBillProject.getProjectType()))) {
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
index 646f8674..ea9bd7ee 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
@@ -116,6 +116,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
      * @param payPaymentRecord
      */
     @Override
+    @Transactional
     public void addOneAmountReceived(PayPaymentRecord payPaymentRecord,List<TbCheckVo> typr5List){
 
         BigDecimal receivableAmount;