Commit 00061707 by zhiheng.zhang

聚合层取值修改为结算值

parent d455c1f9
...@@ -139,6 +139,7 @@ import org.springframework.stereotype.Service; ...@@ -139,6 +139,7 @@ import org.springframework.stereotype.Service;
import tk.mybatis.mapper.util.StringUtil; import tk.mybatis.mapper.util.StringUtil;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -2445,6 +2446,12 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2445,6 +2446,12 @@ public class OrderServiceImpl implements Orderservice {
imgUrl.add(String.valueOf(jsonArray.get(i))); imgUrl.add(String.valueOf(jsonArray.get(i)));
} }
} }
if(null !=orderBean.getOrderSettlementDetailList() && orderBean.getOrderSettlementDetailList().size()>0){
queryOrderByConditionsResponseVo.setSettlementAmount(orderBean.getOrderSettlementDetailList().get(0).getSettlementAmount());
}else{
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