zhijiezhao 3 years ago
parent
commit
9b056a9a40

+ 4 - 3
src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -1089,12 +1089,13 @@ public class PayOrderServiceImpl implements PayOrderService {
                         totalAmount4 = MathUtil.add(totalAmount4, account.getSplitAccount()).doubleValue();
                         totalAmount4 = MathUtil.add(totalAmount4, account.getSplitAccount()).doubleValue();
                     }
                     }
                 }
                 }
-                addMaps(maps, totalAmount1, PayUtil.publicAccountNo);
+                //分账方不能重复,1,5都是信息,加一起分
+                double v = MathUtil.add(totalAmount1, totalAmount4).doubleValue();
+                addMaps(maps, v, PayUtil.publicAccountNo);
                 addMaps(maps, totalAmount2, PayUtil.privateAccountNo);
                 addMaps(maps, totalAmount2, PayUtil.privateAccountNo);
                 addMaps(maps, totalAmount3, PayUtil.commonInvoiceNo);
                 addMaps(maps, totalAmount3, PayUtil.commonInvoiceNo);
                 // 网络切信息
                 // 网络切信息
-                // addMaps(maps, totalAmount4, PayUtil.brokerage);
-                addMaps(maps, totalAmount4, PayUtil.publicAccountNo);
+//                addMaps(maps, totalAmount4, PayUtil.publicAccountNo);
                 String parameters = JSON.toJSONString(maps);
                 String parameters = JSON.toJSONString(maps);
                 log.info("【延时分账】>>>>>>>>>>分账参数: " + parameters);
                 log.info("【延时分账】>>>>>>>>>>分账参数: " + parameters);