Merge branch 'featur/20210526-预支付字段添加'

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/payment/CombPayRequest.java

@@ -71,5 +71,5 @@ public class CombPayRequest {
     private String request_source ="V1";
     private String ver ="10";
     private String storeName;
-
+    private Long merchantDiscount;
 }

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -3155,9 +3155,8 @@ public class OrderAdapter {
             orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
         }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
-        orderPayDto.setMerchantDiscount(orderBean.getAccountList() == null ?
-                0L:orderBean.getAccountList().stream().filter(a->a.getType()==null && a.getType() != 1)
-                .mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum());
+        orderPayDto.setMerchantDiscount(Math.abs(orderBean.getAccountList().stream().mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum()));
+
         return orderPayDto;
     }
 
@@ -4020,6 +4019,7 @@ public class OrderAdapter {
                 productVOS.add(productBean);
             }
         }
+        orderPayDto.setMerchantDiscount(Math.abs(orderBean.getAccountList().stream().mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum()));
         orderPayDto.setProducts(productVOS);
         List<PayPlatformVO> platforms = new ArrayList<>();
         PayPlatformVO payPlatformVO = new PayPlatformVO();