From 8974ee7cb68dfa0152e5c4998c0157e76c115bac Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Wed, 22 Sep 2021 09:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=9D=A5=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PayMeetingSituationServiceImpl.java  |  2 +-
 .../PayPaymentRecordController.java           | 11 ++++++--
 .../service/IPayPaymentRecordService.java     |  8 +++++-
 .../impl/PayPaymentRecordServiceImpl.java     | 28 +++++++++++++------
 4 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
index a9c6fc03..55189b42 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingSituationServiceImpl.java
@@ -196,7 +196,7 @@ public class PayMeetingSituationServiceImpl extends ServiceImpl<PayMeetingSituat
         payPaymentRecord.setAmountReceived(meetingSituation.getAmountReceivable());
         payPaymentRecord.setPaymentDate(new Date());
 
-        payPaymentRecordService.addAmountReceived(payPaymentRecord);
+//        payPaymentRecordService.addAmountReceived(payPaymentRecord);
     }
 
     @Override
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
index d4a00349..65998fd0 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/controller/PayPaymentRecordController.java
@@ -71,13 +71,18 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 	
 	/**
 	 *   添加来款
-	 * @param payPaymentRecord
 	 * @return
 	 */
 	@ApiOperation(value="添加来款", notes="添加来款")
 	@PostMapping(value = "/addAmountReceived")
-	public Result<?> addAmountReceived(@RequestBody PayPaymentRecord payPaymentRecord) {
-		return payPaymentRecordService.addAmountReceived(payPaymentRecord);
+	public Result<?> addAmountReceived(@RequestBody List<PayPaymentRecord> list) {
+		try{
+			payPaymentRecordService.addAmountReceived(list);
+		}catch (Exception e){
+			log.error("添加来款异常",e);
+			return Result.error(e.getMessage());
+		}
+		return Result.OK("操作成功");
 	}
 
 	/**
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java
index c3f97308..f5a6a7cb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/payment/service/IPayPaymentRecordService.java
@@ -29,9 +29,15 @@ public interface IPayPaymentRecordService extends IService<PayPaymentRecord> {
 
     /**
      * 添加来款
+     * @param list
+     */
+    void addAmountReceived(List<PayPaymentRecord> list);
+
+    /**
+     * 添加一个来款
      * @param payPaymentRecord
      */
-    Result<?> addAmountReceived(PayPaymentRecord payPaymentRecord);
+    void addOneAmountReceived(PayPaymentRecord payPaymentRecord);
 
     /**
      * 标协会员添加来款
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 6039bed9..45322dbb 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
@@ -36,6 +36,8 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.transaction.Transactional;
+import java.beans.Transient;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -79,13 +81,23 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
         return payPaymentRecordMapper.mainList(page, payCommonProject,projectType, paymentDate);
     }
 
+    /**
+     * 添加来款记录
+     */
+    @Transactional
+    @Override
+    public void addAmountReceived(List<PayPaymentRecord> list){
+        for(PayPaymentRecord payPaymentRecord : list){
+            addOneAmountReceived(payPaymentRecord);
+        }
+    }
 
     /**
-     *  添加来款记录
+     *  添加一个来款记录
      * @param payPaymentRecord
      */
     @Override
-    public Result<?> addAmountReceived(PayPaymentRecord payPaymentRecord){
+    public void addOneAmountReceived(PayPaymentRecord payPaymentRecord){
 
         BigDecimal receivableAmount;
         Boolean isAdd;
@@ -112,7 +124,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                     payCommonProject.setInAccount(inAccount);
                     payCommonProjectMapper.updateById(payCommonProject);
                 }else{
-                    return Result.error("到账金额大于当前欠款金额，不可提交！");
+                    throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
                 break;
             // 工作组项目
@@ -133,7 +145,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                     payWorking.setInAccount(inAccount);
                     payWorkingGroupSubItemMapper.updateById(payWorking);
                 }else{
-                    return Result.error("到账金额大于当前欠款金额，不可提交！");
+                    throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
                 break;
             //会议项目
@@ -154,7 +166,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                     meeting.setInAccount(inAccount);
                     payMeetingSituationMapper.updateById(meeting);
                 }else{
-                    return Result.error("到账金额大于当前欠款金额，不可提交！");
+                    throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
                 break;
             //会员项目
@@ -176,7 +188,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
                     payMemberProjectSubitemMapper.updateById(member);
 
                 }else{
-                    return Result.error("到账金额大于当前欠款金额，不可提交！");
+                    throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
                 break;
             //标协会员
@@ -201,14 +213,14 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
 
                     sendToStandards(tbMember,payPaymentRecord);
                 }else{
-                    return Result.error("到账金额大于当前欠款金额，不可提交！");
+                    throw new JeroBootException("到账金额大于当前欠款金额，不可提交！");
                 }
                 break;
             default:break;
         }
         //插入来款记录表
         payPaymentRecordMapper.insert(payPaymentRecord);
-        return Result.OK("添加成功！");
+//        return Result.OK("添加成功！");
     }
 
     /**