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

群收款金额修复

See merge request !53

order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java

@@ -117,7 +117,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
             groupBuyDto = new GroupBuyDto();
             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);
             // 运费分摊
@@ -187,7 +187,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
         GroupBuyRequest.UserInfo groupBuyUserInfo;
         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);
             // 运费分摊