混合支付优惠金额添加

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

@@ -4018,6 +4018,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();