Commit 17fc3923 by 张跃

预支付接口字段添加

parent c3f45d59
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
<dependency> <dependency>
<groupId>com.freemud.sdk.api.assortment</groupId> <groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-payment-sdk</artifactId> <artifactId>assortment-payment-sdk</artifactId>
<version>2.6.8.RELEASE</version> <version>2.6.7.SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.rocketmq</groupId> <groupId>org.apache.rocketmq</groupId>
......
...@@ -3154,6 +3154,8 @@ public class OrderAdapter { ...@@ -3154,6 +3154,8 @@ public class OrderAdapter {
orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode()); orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
} }
orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType())); orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
orderPayDto.setMerchantDiscount(orderBean.getAccountList() == null ?
0L:orderBean.getAccountList().stream().mapToLong(QueryOrdersResponse.DataBean.OrderBean.AccountBean::getShopDiscountAmount).sum());
return orderPayDto; return orderPayDto;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment