Skip to content

O
order-group
Commit c69143c8 by zhiheng.zhang
Options

Merge branch '202007131400' into qa

parents cb19f7eb 92fca449
Showing with 1 additions and 4 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -2448,13 +2448,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2448,13 +2448,10 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
if(null !=orderBean.getOrderSettlementDetailList() && orderBean.getOrderSettlementDetailList().size()>0){ if(null !=orderBean.getOrderSettlementDetailList() && orderBean.getOrderSettlementDetailList().size()>0){
BigDecimal settlement = orderBean.getOrderSettlementDetailList().get(0).getSettlementAmount(); queryOrderByConditionsResponseVo.setSettlementAmount(orderBean.getOrderSettlementDetailList().stream().map(OrderSettlementResp::getSettlementAmount).reduce(BigDecimal.ZERO,BigDecimal::add));
settlement = null==settlement ? BigDecimal.ZERO : settlement;
queryOrderByConditionsResponseVo.setSettlementAmount(settlement);
}else{ }else{
queryOrderByConditionsResponseVo.setSettlementAmount(BigDecimal.ZERO); queryOrderByConditionsResponseVo.setSettlementAmount(BigDecimal.ZERO);
} }
queryOrderByConditionsResponseVo.setSettlementAmount(orderBean.getOrderSettlementDetailList().get(0).getSettlementAmount());
queryOrderByConditionsResponseVo.setImgUrl(imgUrl); queryOrderByConditionsResponseVo.setImgUrl(imgUrl);
queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState())); queryOrderByConditionsResponseVo.setOrderStateValue(orderSdkAdapter.getOrderStatusValue(orderBean.getOrderState()));
SimpleDateFormat sdff=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdff=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
......
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