Merge remote-tracking branch 'origin/developerA' into developerA

src/main/java/com/caimei/model/vo/SplitAccountVo.java

@@ -75,5 +75,24 @@ public class SplitAccountVo {
      */
     private Date splitTime;
 
+    @Override
+    public String toString() {
+        return "SplitAccountVo{" +
+                "id=" + id +
+                ", orderId=" + orderId +
+                ", productId=" + productId +
+                ", orderProductId=" + orderProductId +
+                ", shopId=" + shopId +
+                ", type='" + type + '\'' +
+                ", subUserNo='" + subUserNo + '\'' +
+                ", splitAccount=" + splitAccount +
+                ", mbOrderId='" + mbOrderId + '\'' +
+                ", orderRequestNo='" + orderRequestNo + '\'' +
+                ", payStatus='" + payStatus + '\'' +
+                ", productType='" + productType + '\'' +
+                ", splitTime=" + splitTime +
+                '}';
+    }
+
     private static final long serialVersionUID = 1L;
 }

src/main/java/com/caimei/service/impl/PayOrderServiceImpl.java

@@ -563,6 +563,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                         splitAccount.setSubUserNo(commonInvoiceNo);
                     }
                 }
+                log.info("分账详情(成本)：" + splitAccount);
                 list.add(splitAccount);
                 if (MathUtil.compare(splitAmount, 0) == 0) {
                     break;
@@ -580,7 +581,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                     BigDecimal shipping = payOrderMapper.findShipping(order.getOrderId(), shopOrder.getShopId());
                     shopPostFee = MathUtil.sub(shopPostFee, shipping);
                     if (MathUtil.compare(splitAmount, shopPostFee) > -1) {
-                        splitAmount = MathUtil.sub(splitAmount, shipping);
+                        splitAmount = MathUtil.sub(splitAmount, shopPostFee);
                     } else {
                         shopPostFee = splitAmount;
                         splitAmount = BigDecimal.ZERO;
@@ -600,6 +601,7 @@ public class PayOrderServiceImpl implements PayOrderService {
                         splitAccount.setType("2");
                         splitAccount.setSubUserNo(privateAccountNo);
                     }
+                    log.info("分账详情(付供应商运费)：" + splitAccount);
                     list.add(splitAccount);
                 }
             }
@@ -613,6 +615,7 @@ public class PayOrderServiceImpl implements PayOrderService {
             splitAccount.setProductType("3");
             splitAccount.setType("1");
             splitAccount.setSubUserNo(publicAccountNo);
+            log.info("分账详情(佣金)：" + splitAccount);
             list.add(splitAccount);
         }
         return list;

src/main/resources/mapper/PayOrderMapper.xml

@@ -132,6 +132,7 @@
           invoiceType,
           taxRate,
           totalAddedValueTax,
+          singleShouldPayTotalTax,
           notOutStore,
           name,
           productUnit,