Merge branch '202007131400' into qa

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

@@ -2448,13 +2448,10 @@ public class OrderServiceImpl implements Orderservice {
                     }
                 }
                 if(null !=orderBean.getOrderSettlementDetailList() && orderBean.getOrderSettlementDetailList().size()>0){
-                    BigDecimal settlement = orderBean.getOrderSettlementDetailList().get(0).getSettlementAmount();
-                    settlement = null==settlement ? BigDecimal.ZERO : settlement;
-                    queryOrderByConditionsResponseVo.setSettlementAmount(settlement);
+                    queryOrderByConditionsResponseVo.setSettlementAmount(orderBean.getOrderSettlementDetailList().stream().map(OrderSettlementResp::getSettlementAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
                 }else{
                     queryOrderByConditionsResponseVo.setSettlementAmount(BigDecimal.ZERO);
                 }
-                queryOrderByConditionsResponseVo.setSettlementAmount(orderBean.getOrderSettlementDetailList().get(0).getSettlementAmount());
                 queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
                 queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
                 SimpleDateFormat sdff=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");