订单返回对象合并

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

@@ -95,7 +95,6 @@ import com.freemud.application.sdk.api.ordercenter.response.BaseDownLoadResponse
 import com.freemud.application.sdk.api.ordercenter.response.OrderCountResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderStateInfoResp;
-import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
@@ -2233,7 +2232,7 @@ public class OrderServiceImpl implements Orderservice {
         req.setOperator(userInfo.getNickName());
         //积分订单为4
         req.setOrderType((byte) 4);
-        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderResp> result = orderSdkService.parking_v2_create(req, LogThreadLocal.getTrackingNo());
+        com.freemud.application.sdk.api.ordercenter.response.BaseResponse<OrderInfoReqs> result = orderSdkService.parking_v2_create(req, LogThreadLocal.getTrackingNo());
         if (Objects.isNull(result)) {
             return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null);
         }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/carpark/OrderInvoiceResp.java

-package com.freemud.application.sdk.api.ordercenter.response.carpark;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * All rights Reserved, Designed By www.freemud.com
- *
- * @version V1.0
- * @Description: 一句话描述
- * @author: hongwang.zhang
- * @date: 2020-01-07 19:43:40
- * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
- * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
- */
-public class OrderInvoiceResp {
-   /***  "订单ID"***/
-    private Long orderId;
-
-   /***  "商户编号"***/
-    private String partnerId;
-
-   /***  "订单商品ID"***/
-    private String itemId;
-
-   /***  OrderInvoiceType.API_DESC***/
-    private Byte invoiceType;
-
-   /***  "发票抬头"***/
-    private String title;
-
-   /***  "发票内容"***/
-    private String content;
-
-   /***  "税号"***/
-    private String taxNo;
-
-   /***  "发票金额 单位分"***/
-    private BigDecimal amount;
-
-   /***  "发票地址"***/
-    private String address;
-
-   /***  "电话号码"***/
-    private String phoneNo;
-
-   /***  "银行账号"***/
-    private String bankCardNo;
-
-   /***  "开户行"***/
-    private String invoiceBank;
-
-   /***  "发票URL地址"***/
-    private String invoiceUrl;
-
-   /***  "创建时间"***/
-    private Date createTime;
-
-   /***  "更新时间"***/
-    private Date updateTime;
-}
+//package com.freemud.application.sdk.api.ordercenter.response.carpark;
+//
+//import java.math.BigDecimal;
+//import java.util.Date;
+//
+///**
+// * All rights Reserved, Designed By www.freemud.com
+// *
+// * @version V1.0
+// * @Description: 一句话描述
+// * @author: hongwang.zhang
+// * @date: 2020-01-07 19:43:40
+// * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
+// */
+//public class OrderInvoiceResp {
+//   /***  "订单ID"***/
+//    private Long orderId;
+//
+//   /***  "商户编号"***/
+//    private String partnerId;
+//
+//   /***  "订单商品ID"***/
+//    private String itemId;
+//
+//   /***  OrderInvoiceType.API_DESC***/
+//    private Byte invoiceType;
+//
+//   /***  "发票抬头"***/
+//    private String title;
+//
+//   /***  "发票内容"***/
+//    private String content;
+//
+//   /***  "税号"***/
+//    private String taxNo;
+//
+//   /***  "发票金额 单位分"***/
+//    private BigDecimal amount;
+//
+//   /***  "发票地址"***/
+//    private String address;
+//
+//   /***  "电话号码"***/
+//    private String phoneNo;
+//
+//   /***  "银行账号"***/
+//    private String bankCardNo;
+//
+//   /***  "开户行"***/
+//    private String invoiceBank;
+//
+//   /***  "发票URL地址"***/
+//    private String invoiceUrl;
+//
+//   /***  "创建时间"***/
+//    private Date createTime;
+//
+//   /***  "更新时间"***/
+//    private Date updateTime;
+//}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java

@@ -13,7 +13,6 @@
 package com.freemud.application.sdk.api.ordercenter.response.orderInfo;
 
 import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
-import com.freemud.application.sdk.api.ordercenter.request.OrderTraceInfoResp;
 import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
 import lombok.Data;
 
@@ -360,85 +359,87 @@ public class OrderInfoReqs {
      * 预计送达时间
      */
     private String estimateDeliveryCompleteTime;
-
     /**
-     * 发票明细
+     * 下单区域
      */
-    private OrderInvoice orderInvoice;
+    private String orderArea;
+
+    private Integer dispenseStatus;
 
     /**
-     * 订单商品信息
+     * 是否立即送达
      */
-    List<OrderItemResp> orderItemList;
+    private Boolean immediately;
 
     /**
-     * 配送联系信息
+     * 下游POS商编号
      */
-    List<DeliveryContactInfoResp> deliveryContactInfoList;
+    private String downstreamPosCode;
 
     /**
-     * 订单费用信息
+     * 下游订单号
      */
-    List<OrderCostResp> orderCostDetailList;
+    private String downstreamThirdOrderCode;
 
     /**
-     * 订单结算信息
+     * 支付渠道类型
      */
-    List<OrderSettlementResp> orderSettlementDetailList;
+    private String payChannelType;
+
+    private String appId;
+
+    /*** 区分订单来源 0:KA 1:开个店 2019-07-29　基础服务新增字段　***/
+    private Byte sourceType;
+
     /**
-     * 售后单信息
+     * 操作人
      */
-    List<AfterSalesOrderResp> afterSalesOrderList;
+    private String operator;
 
     /**
-     * 订单操作历史
+     * 订单扩展信息 （门店渠道信息）
      */
-    List<OrderOperationHistoryResp> orderOperationHistoryList;
+    private OrderExtendedReq orderExtended;
 
     /**
-     * 下单区域
+     * 发票明细
      */
-    private String orderArea;
-
-    private Integer dispenseStatus;
+    private OrderInvoice orderInvoice;
 
     /**
-     * 是否立即送达
+     * 订单商品信息
      */
-    private Boolean immediately;
+    private List<OrderItemResp> orderItemList;
 
     /**
-     * 订单扩展信息 （门店渠道信息）
+     * 配送联系信息
      */
-    private OrderExtendedReq orderExtended;
+    private List<DeliveryContactInfoResp> deliveryContactInfoList;
 
     /**
-     * 下游POS商编号
+     * 订单费用信息
      */
-    private String downstreamPosCode;
+    private List<OrderCostResp> orderCostDetailList;
 
     /**
-     * 下游订单号
+     * 订单结算信息
      */
-    private String downstreamThirdOrderCode;
+    private List<OrderSettlementResp> orderSettlementDetailList;
+    /**
+     * 售后单信息
+     */
+    private List<AfterSalesOrderResp> afterSalesOrderList;
 
     /**
-     * 支付渠道类型
+     * 订单操作历史
      */
-    private String payChannelType;
+    private List<OrderOperationHistoryResp> orderOperationHistoryList;
 
     /**
      * 支付信息
      */
     private List<OrderPayItemResp> orderPayItemCreateReqList;
 
-    private String appId;
-
-    List<OrderSendCouponResp> orderSendCouponRespList;
-
-    /**
-     * 操作人
-     */
-    private String operator;
+    private List<OrderSendCouponResp> orderSendCouponRespList;
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -2,7 +2,6 @@ package com.freemud.application.sdk.api.ordercenter.service;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.base.BaseRequest;
 import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
 import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
@@ -17,7 +16,6 @@ import com.freemud.application.sdk.api.ordercenter.request.create.BatchQueryByCo
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateFatherSonOrderReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
 import com.freemud.application.sdk.api.ordercenter.response.*;
-import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
@@ -31,7 +29,10 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
 import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant.*;
 
 /**
@@ -830,8 +831,8 @@ public class OrderSdkService {
      * 停车场 创建订单
      */
     public BaseResponse parking_v2_create(ParkingOrderCreateReq request, String trackingNo) {
-        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CREATE,
-                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+        OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CREATE,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
                 });
         return responseHandle(responseDTO);
     }
@@ -842,8 +843,8 @@ public class OrderSdkService {
      * 完成停车订单
      */
     public BaseResponse parking_v2_affirm(ParkingOrderAffirmReq request, String trackingNo) {
-        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_AFFIRM,
-                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+        OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_AFFIRM,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
                 });
         return responseHandle(responseDTO);
     }
@@ -853,8 +854,8 @@ public class OrderSdkService {
      * 审核不通过
      */
     public BaseResponse parking_v2_cancel(ParkingOrderCancelReq request, String trackingNo) {
-        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CANCEL,
-                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+        OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CANCEL,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
                 });
         return responseHandle(responseDTO);
     }
@@ -877,8 +878,8 @@ public class OrderSdkService {
      * 撤单
      */
     public BaseResponse parkingOrderRevoke(ParkingOrderRevokeReq request, String trackingNo) {
-        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_REVOKE,
-                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+        OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_REVOKE,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
                 });
         return responseHandle(responseDTO);
     }