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

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

@@ -3155,7 +3155,7 @@ public class OrderAdapter {
             orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
         }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
-        orderPayDto.setMerchantDiscount(Math.abs(orderBean.getAccountList().stream().mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum()));
+        orderPayDto.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
 
         return orderPayDto;
     }
@@ -4019,7 +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.setMerchantDiscount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
         orderPayDto.setProducts(productVOS);
         List<PayPlatformVO> platforms = new ArrayList<>();
         PayPlatformVO payPlatformVO = new PayPlatformVO();