Merge branch '202007131400' into develop

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

@@ -2452,7 +2452,6 @@ public class OrderServiceImpl implements Orderservice {
                 }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");

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderCreateReq.java

@@ -82,5 +82,10 @@ public class ParkingOrderCreateReq {
      */
     private String partnerName;
 
+    /**
+     * 订单那类型
+     */
+    private Byte orderType;
+
    
 }