预支付接口字段添加

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

@@ -3154,8 +3154,11 @@ public class OrderAdapter {
             orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
         }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
-        orderPayDto.setMerchantDiscount(orderBean.getAccountList() == null ?
-                0L:orderBean.getAccountList().stream().mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum());
+        orderPayDto.setMerchantDiscount(orderBean.getOrderSettlementDetailList() == null? 0L :
+                Math.abs(orderBean.getOrderSettlementDetailList().stream().
+                        filter(a -> ("0".equals(a.getProductId()) || StringUtils.isBlank(a.getProductId())) && OrderSettlementType.DISCOUNT_FEE.getIndex() != a.getSettlementType().intValue()).
+                        mapToLong(a -> a.getShopDiscountAmount()==null?0L: a.getShopDiscountAmount()).sum()));
+
         return orderPayDto;
     }