更新

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PaymentManagementController.java

@@ -163,7 +163,12 @@ public class PaymentManagementController {
     public List<String> readXmlManagement(@RequestBody PaymentManagement paymentManagement) {
         List<PaymentManagement> paymentManagementList = paymentManagement.getPaymentManagementList();
         List<String> str = new ArrayList<>();
-
+        for(int i=0;i<paymentManagementList.size();i++){
+            paymentManagement = paymentManagementList.get(i);
+            paymentManagement.setInvoicing("1");
+            paymentManagement.setIdentityAuthenticationInfo(iIdentityAuthenticationInfoService.selectById(paymentManagement.getIdentityId()));
+            paymentManagementService.updateById(paymentManagement);
+        }
         if(paymentManagementList.size() >0 && !"1".equals(paymentManagementList.get(0).getInvoiceFlag())){
             List<PaymentManagement> list1 = new ArrayList<>();
             for(int i=0;i<paymentManagementList.size();i++){
@@ -195,25 +200,26 @@ public class PaymentManagementController {
                     );
                     list1.add(tmp1);
                 }
+                else{
+                    list1.add(tmp);
+                }
             }
-            if("2".equals(paymentManagement.getInvoiceFlag()) && paymentManagement.getRemarkss() != null){
-                paymentManagementList = list1;
-            }
+//            if("2".equals(paymentManagement.getInvoiceFlag()) && paymentManagement.getRemarkss() != null){
+//                paymentManagementList = list1;
+//            }
+            paymentManagementList = list1;
         }
 
         for(int i=0;i<paymentManagementList.size();i++){
-            paymentManagement = paymentManagementList.get(i);
-            paymentManagement.setInvoicing("1");
-            paymentManagement.setIdentityAuthenticationInfo(iIdentityAuthenticationInfoService.selectById(paymentManagement.getIdentityId()));
-            if("1".equals(paymentManagement.getInvoiceFlag())){
-                str.add(xmlUtil.readXml(paymentManagement));
-            }else if("2".equals(paymentManagement.getInvoiceFlag()) && paymentManagement.getRemarkss() != null){
-                str.add(xmlUtil.readsXml(paymentManagement));
-            }else if("2".equals(paymentManagement.getInvoiceFlag())){
-                str.add(xmlUtil.readXmls(paymentManagement));
+            PaymentManagement temp = paymentManagementList.get(i);
+            if("1".equals(temp.getInvoiceFlag())){
+                str.add(xmlUtil.readXml(temp));
+            }else if("2".equals(temp.getInvoiceFlag()) && temp.getRemarkss() != null){
+                temp.setId(temp.getId()+i);
+                str.add(xmlUtil.readsXml(temp));
+            }else if("2".equals(temp.getInvoiceFlag())){
+                str.add(xmlUtil.readXmls(temp));
             }
-
-            paymentManagementService.updateById(paymentManagement);
         }
         return str;
     }