去除外卖配送费

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

@@ -3155,7 +3155,8 @@ public class OrderAdapter {
         }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
         orderPayDto.setMerchantDiscount(orderBean.getAccountList() == null ?
-                0L:orderBean.getAccountList().stream().mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum());
+                0L:orderBean.getAccountList().stream().filter(a->a.getType()==null && a.getType() != 1)
+                .mapToLong(account->account.getShopDiscountAmount()==null?0L:account.getShopDiscountAmount()).sum());
         return orderPayDto;
     }