Merge branch '202007131400' into qa

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -38,7 +38,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 @EnableSwagger2
 @EnableCircuitBreaker
 @SpringBootApplication
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
 @EnableAspectJAutoProxy
 @ComponentScan({"cn.freemud", "com.freemud"})
 @MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",

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

@@ -84,6 +84,7 @@ import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderC
 import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderDownLoadSdkService;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
 import com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest;
@@ -139,6 +140,7 @@ import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.util.StringUtil;
 
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -2445,6 +2447,12 @@ public class OrderServiceImpl implements Orderservice {
                         imgUrl.add(String.valueOf(jsonArray.get(i)));
                     }
                 }
+                if(null !=orderBean.getOrderSettlementDetailList() && orderBean.getOrderSettlementDetailList().size()>0){
+                    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");