线上分账配置佣金账户

src/main/java/com/caimei365/order/model/po/SplitAccountPo.java

@@ -37,7 +37,7 @@ public class SplitAccountPo implements Serializable {
      */
     private Integer vipRecordId;
     /**
-     * 分账类型:1公账-专票,2私账-无票,3公账-普票,4供应商子商户
+     * 分账类型:1公账-专票,2私账-无票,3公账-普票,4供应商子商户,5佣金账户
      */
     private Integer type;
     /**

src/main/java/com/caimei365/order/service/impl/PayOrderServiceImpl.java

@@ -1014,7 +1014,7 @@ public class PayOrderServiceImpl implements PayOrderService {
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(new Date());
         //测试减2分钟
-        calendar.add(Calendar.MINUTE,-2);
+        calendar.add(Calendar.MINUTE, -2);
 //        calendar.add(Calendar.DAY_OF_MONTH, -1);
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String currentTime = format.format(calendar.getTime());
@@ -1055,10 +1055,11 @@ public class PayOrderServiceImpl implements PayOrderService {
                     addMaps(maps, shopTotalAmount, subUserNo);
                 }
                 //公账-专票总金额,私账-无票总金额,公账-普票总金额
-                //todo 佣金进网络
+                //佣金进网络
                 double totalAmount1 = 0.00;
                 double totalAmount2 = 0.00;
                 double totalAmount3 = 0.00;
+                double totalAmount4 = 0.00;
                 for (SplitAccountPo account : splitBillDetail) {
                     if (1 == account.getType()) {
                         totalAmount1 = MathUtil.add(totalAmount1, account.getSplitAccount()).doubleValue();
@@ -1066,11 +1067,14 @@ public class PayOrderServiceImpl implements PayOrderService {
                         totalAmount2 = MathUtil.add(totalAmount2, account.getSplitAccount()).doubleValue();
                     } else if (3 == account.getType()) {
                         totalAmount3 = MathUtil.add(totalAmount3, account.getSplitAccount()).doubleValue();
+                    } else if (5 == account.getType()) {
+                        totalAmount4 = MathUtil.add(totalAmount4, account.getSplitAccount()).doubleValue());
                     }
                 }
                 addMaps(maps, totalAmount1, PayUtil.publicAccountNo);
                 addMaps(maps, totalAmount2, PayUtil.privateAccountNo);
                 addMaps(maps, totalAmount3, PayUtil.commonInvoiceNo);
+                addMaps(maps, totalAmount4, PayUtil.brokerage);
                 String parameters = JSON.toJSONString(maps);
                 log.info("【延时分账】>>>>>>>>>>分账参数: " + parameters);
 
@@ -1246,8 +1250,8 @@ public class PayOrderServiceImpl implements PayOrderService {
             splitAccount.setOrderId(order.getOrderId());
             splitAccount.setSplitAccount(splitAmount);
             splitAccount.setProductType(3);
-            splitAccount.setType(1);
-            splitAccount.setSubUserNo(PayUtil.publicAccountNo);
+            splitAccount.setType(5);
+            splitAccount.setSubUserNo(PayUtil.brokerage);
             list.add(splitAccount);
         }
         return list;

src/main/java/com/caimei365/order/utils/PayUtil.java

@@ -47,6 +47,10 @@ public class PayUtil {
      * 私账-无票,子商户商编
      */
     public static final String privateAccountNo = "20001924";
+    /**
+     * 彩美网络，佣金账户
+     */
+    public static final String brokerage="20004104";
 
     /**
      * 支付状态转换