From 666d3ca1cd0933344fd5c7527d102ceb8949d9a0 Mon Sep 17 00:00:00 2001
From: baozhipeng <961815525@qq.com>
Date: Fri, 10 Sep 2021 14:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mail/service/IPayMailBillService.java     |  2 +-
 .../service/impl/PayMailBillServiceImpl.java  | 34 +++++++++++--------
 .../PayPaymentRecordController.java           |  4 +--
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
index b61c313a..896b8b6c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/mail/service/IPayMailBillService.java
@@ -29,5 +29,5 @@ public interface IPayMailBillService extends IService<PayMailBill> {
      * @param payMailBill
      * @return
      */
-    Result<?> addPayBill(PayMailBill payMailBill,String projectId,Integer projectType);
+    Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes);
 }
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 4bc34808..26bd250f 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
@@ -55,29 +55,35 @@ public class PayMailBillServiceImpl extends ServiceImpl<PayMailBillMapper, PayMa
      * @param payMailBill
      * @return
      */
-    public Result<?> addPayBill(PayMailBill payMailBill,String projectId,Integer projectType){
+    public Result<?> addPayBill(PayMailBill payMailBill,String projectIds,String projectTypes){
+        String[] projectIdArray = projectIds.split(",");
+        String[] projectTypeArray = projectTypes.split(",");
 
-        if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(projectType))){
+        for (int i = 0; i < projectIdArray.length; i++) {
+            if(PayIncomeContractCommon.PROJECT_TYPE5.equals(String.valueOf(projectIdArray[i]))){
 
-            LambdaQueryWrapper<PayMailBillProject> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(PayMailBillProject::getProjectId, projectId);
-            wrapper.eq(PayMailBillProject::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5);
-            List<PayMailBillProject> type5List = payMailBillProjectService.list(wrapper);
+                LambdaQueryWrapper<PayMailBillProject> wrapper = new LambdaQueryWrapper<>();
+                wrapper.eq(PayMailBillProject::getProjectId, projectIdArray[i]);
+                wrapper.eq(PayMailBillProject::getProjectType, PayIncomeContractCommon.PROJECT_TYPE5);
+                List<PayMailBillProject> type5List = payMailBillProjectService.list(wrapper);
 
-            if(type5List!=null && type5List.size()>0){
-                return Result.error("标协会员项目，只能开票一次。");
+                if(type5List!=null && type5List.size()>0){
+                    return Result.error("标协会员项目，只能开票一次。");
+                }
             }
         }
+
         //新增票据邮寄表
         payMailBillService.save(payMailBill);
 
         //新增票据关联项目表
-        PayMailBillProject payMailBillProject = new PayMailBillProject();
-        payMailBillProject.setBillId(payMailBill.getId());
-        payMailBillProject.setProjectId(projectId);
-        payMailBillProject.setProjectType(projectType);
-        payMailBillProjectService.save(payMailBillProject);
-
+        for (int i = 0; i < projectTypeArray.length; i++) {
+            PayMailBillProject payMailBillProject = new PayMailBillProject();
+            payMailBillProject.setBillId(payMailBill.getId());
+            payMailBillProject.setProjectId(projectIdArray[i]);
+            payMailBillProject.setProjectType(Integer.valueOf(projectTypeArray[i]));
+            payMailBillProjectService.save(payMailBillProject);
+        }
         return Result.OK("添加成功！");
     }
 }
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 515364fd..aae42271 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
@@ -99,8 +99,8 @@ public class PayPaymentRecordController extends JeroController<PayPaymentRecord,
 	  */
 	 @ApiOperation(value="添加开票", notes="添加开票")
 	 @PostMapping(value = "/addPayBill")
-	 public Result<?> addPayBill(@RequestBody PayMailBill payMailBill,String projectId,Integer projectType) {
-		 return payMailBillService.addPayBill(payMailBill, projectId, projectType);
+	 public Result<?> addPayBill(@RequestBody PayMailBill payMailBill,String projectIds,String projectTypes) {
+		 return payMailBillService.addPayBill(payMailBill, projectIds, projectTypes);
 	 }
 
 	 /**