Merge remote-tracking branch 'origin/master'

ms-biz/src/main/java/com/ms/api/service/impl/DistributionOrderServiceImpl.java

@@ -752,6 +752,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
         purchasePayment = purchasePayment == null ? 0 : purchasePayment;
         orderCommission = orderCommission == null ? 0 : orderCommission;
 
+        log.info("orderProfitSum_" + orderId + " " + orderPayment + "_" + platformCostAmount + "_" + orderCommission + "_" + purchasePayment + "_" + postInsuranceAmount);
         double orderProfitSum = orderPayment + platformCostAmount + orderCommission - purchasePayment - postInsuranceAmount;
         double orderTotalProfitRate = orderPayment > 0 ? orderProfitSum / orderPayment * 100 : 0;
 

ms-biz/src/main/java/com/ms/api/util/PurchaseOrderUtil.java

@@ -130,7 +130,7 @@ public class PurchaseOrderUtil {
                     OrderConst.ORDER_STATUS_WAIT_SELLER_SEND_GOODS,
                     OrderConst.ORDER_STATUS_PART_DELIVERY,
                     OrderConst.ORDER_STATUS_FINISH));
-                params.setDsPurchaseStatus(Arrays.asList(
+                params.setDsPurchaseStatus(Collections.singletonList(
                         DsOrderConst.DS_PURCHASE_STATUS_WAIT_PAY));
                 break;
             case DsOrderConst.PURCHASE_TAB_WAIT_SEND: