Skip to content

O
order-group
Commit 87e55a19 by 缪晖
Options

Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' 

群收款金额修复

See merge request !53
parents 9d817b24 cc00472e
Showing with 2 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
...@@ -117,7 +117,7 @@ public class CollageOrderServiceImpl implements CollageOrderService { ...@@ -117,7 +117,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
groupBuyDto = new GroupBuyDto(); groupBuyDto = new GroupBuyDto();
groupBuyDto.setUserId(payerUserId); groupBuyDto.setUserId(payerUserId);
// 商品费用 // 商品费用
Long itemAmount = productList.stream().filter(product -> (payerUserId.equals(product.getUserId()) && null != product.getSalePrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getSalePrice).reduce(Long::sum).orElse(0L); Long itemAmount = productList.stream().filter(product -> (payerUserId.equals(product.getUserId()) && null != product.getSettlementPrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getSettlementPrice).reduce(Long::sum).orElse(0L);
// 包装费用 // 包装费用
Long packAmount = productList.stream().filter(product -> (payerUserId.equals(product.getUserId()) && null != product.getPackPrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getPackPrice).reduce(Long::sum).orElse(0L); Long packAmount = productList.stream().filter(product -> (payerUserId.equals(product.getUserId()) && null != product.getPackPrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getPackPrice).reduce(Long::sum).orElse(0L);
// 运费分摊 // 运费分摊
...@@ -187,7 +187,7 @@ public class CollageOrderServiceImpl implements CollageOrderService { ...@@ -187,7 +187,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
GroupBuyRequest.UserInfo groupBuyUserInfo; GroupBuyRequest.UserInfo groupBuyUserInfo;
for (String payerOpenId : payerOpenIdList) { for (String payerOpenId : payerOpenIdList) {
// 商品费用 // 商品费用
Long itemAmount = productList.stream().filter(product -> (payerOpenId.equals(product.getOpenId()) && null != product.getSalePrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getSalePrice).reduce(Long::sum).orElse(0L); Long itemAmount = productList.stream().filter(product -> (payerOpenId.equals(product.getOpenId()) && null != product.getSettlementPrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getSettlementPrice).reduce(Long::sum).orElse(0L);
// 包装费用 // 包装费用
Long packAmount = productList.stream().filter(product -> (payerOpenId.equals(product.getOpenId()) && null != product.getPackPrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getPackPrice).reduce(Long::sum).orElse(0L); Long packAmount = productList.stream().filter(product -> (payerOpenId.equals(product.getOpenId()) && null != product.getPackPrice())).map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getPackPrice).reduce(Long::sum).orElse(0L);
// 运费分摊 // 运费分摊
......
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