三方支付

src/main/java/com/poteviohealth/ym/ipos/controller/feign/IposFeignController.java

@@ -194,7 +194,18 @@ public class IposFeignController extends BaseFeignController {
                     supplier.setSourceId(2);
                     supplier.setMerchantId(detail.getSupplierMerchantId());
                     supplier.setDivAmt(detail.getSettlementPrice().toString());
-                    details.add(supplier);
+                    Boolean isHave = false;
+                    for (SplitRecordsDetail splitRecordsDetail : details) {
+                        if(splitRecordsDetail.getSourceId().equals(2) && supplier.getMerchantId().equals(splitRecordsDetail.getMerchantId())){
+                            Long val = Long.parseLong(splitRecordsDetail.getDivAmt())+detail.getSettlementPrice();
+                            splitRecordsDetail.setDivAmt(val.toString());
+                            isHave = true;
+                            break;
+                        }
+                    }
+                    if(!isHave){
+                        details.add(supplier);
+                    }
                 }
             }
 
@@ -214,13 +225,25 @@ public class IposFeignController extends BaseFeignController {
                 station.setSourceId(5);
                 station.setMerchantId(detail.getStationmasterMerchantId());
                 station.setDivAmt(detail.getStationmasterCommissionMoney().toString());
-                details.add(station);
+                Boolean isHave = false;
+                for (SplitRecordsDetail splitRecordsDetail : details) {
+                    if(splitRecordsDetail.getSourceId().equals(5) && station.getMerchantId().equals(splitRecordsDetail.getMerchantId())){
+                        Long val = Long.parseLong(splitRecordsDetail.getDivAmt())+detail.getStationmasterCommissionMoney();
+                        splitRecordsDetail.setDivAmt(val.toString());
+                        isHave = true;
+                        break;
+                    }
+                }
+                if(!isHave){
+                    details.add(station);
+                }
+
             }
 
-           /* VaultsResponse vaultsResponse = splitService.delayConfirm(records,details);
+            VaultsResponse vaultsResponse = splitService.delayConfirm(records,details);
             if(!vaultsResponse.validate()){
                 records.setComment(vaultsResponse.getMessage());
-            }*/
+            }
             records.setStatus(2);
             splitRecordsService.save(records);
             splitRecordsDetailService.saveBatch(details);