Skip to content

O
order-group
Commit 08477cb2 by ping.wu
Options

订单返回对象合并

parent 081ee143
Showing with 376 additions and 375 deletions
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 ...@@ -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.OrderCountResp;
import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp; 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.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.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemReqs; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderPayItemReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
...@@ -2233,7 +2232,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2233,7 +2232,7 @@ public class OrderServiceImpl implements Orderservice {
req.setOperator(userInfo.getNickName()); req.setOperator(userInfo.getNickName());
//积分订单为4 //积分订单为4
req.setOrderType((byte) 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)) { if (Objects.isNull(result)) {
return new BaseResponse(ResponseResultEnum.SYSTEM_ERROR.getCode(), ResponseResultEnum.SYSTEM_ERROR.getMessage(), "", null); 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; //package com.freemud.application.sdk.api.ordercenter.response.carpark;
//
import java.math.BigDecimal; //import java.math.BigDecimal;
import java.util.Date; //import java.util.Date;
//
/** ///**
* All rights Reserved, Designed By www.freemud.com // * All rights Reserved, Designed By www.freemud.com
* // *
* @version V1.0 // * @version V1.0
* @Description: 一句话描述 // * @Description: 一句话描述
* @author: hongwang.zhang // * @author: hongwang.zhang
* @date: 2020-01-07 19:43:40 // * @date: 2020-01-07 19:43:40
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved. // * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目. // * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目.
*/ // */
public class OrderInvoiceResp { //public class OrderInvoiceResp {
/*** "订单ID"***/ // /*** "订单ID"***/
private Long orderId; // private Long orderId;
//
/*** "商户编号"***/ // /*** "商户编号"***/
private String partnerId; // private String partnerId;
//
/*** "订单商品ID"***/ // /*** "订单商品ID"***/
private String itemId; // private String itemId;
//
/*** OrderInvoiceType.API_DESC***/ // /*** OrderInvoiceType.API_DESC***/
private Byte invoiceType; // private Byte invoiceType;
//
/*** "发票抬头"***/ // /*** "发票抬头"***/
private String title; // private String title;
//
/*** "发票内容"***/ // /*** "发票内容"***/
private String content; // private String content;
//
/*** "税号"***/ // /*** "税号"***/
private String taxNo; // private String taxNo;
//
/*** "发票金额 单位分"***/ // /*** "发票金额 单位分"***/
private BigDecimal amount; // private BigDecimal amount;
//
/*** "发票地址"***/ // /*** "发票地址"***/
private String address; // private String address;
//
/*** "电话号码"***/ // /*** "电话号码"***/
private String phoneNo; // private String phoneNo;
//
/*** "银行账号"***/ // /*** "银行账号"***/
private String bankCardNo; // private String bankCardNo;
//
/*** "开户行"***/ // /*** "开户行"***/
private String invoiceBank; // private String invoiceBank;
//
/*** "发票URL地址"***/ // /*** "发票URL地址"***/
private String invoiceUrl; // private String invoiceUrl;
//
/*** "创建时间"***/ // /*** "创建时间"***/
private Date createTime; // private Date createTime;
//
/*** "更新时间"***/ // /*** "更新时间"***/
private Date updateTime; // private Date updateTime;
} //}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/carpark/OrderResp.java
//
//
package com.freemud.application.sdk.api.ordercenter.response.carpark; //package com.freemud.application.sdk.api.ordercenter.response.carpark;
//
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq; //import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderInvoiceResp; //import com.freemud.application.sdk.api.ordercenter.response.carpark.OrderInvoiceResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*; //import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
import lombok.Data; //import lombok.Data;
//
import java.math.BigDecimal; //import java.math.BigDecimal;
import java.util.Date; //import java.util.Date;
import java.util.List; //import java.util.List;
//
/** ///**
* @author qi.xu 2018/09/05 10:30 // * @author qi.xu 2018/09/05 10:30
*/ // */
@Data //@Data
public class OrderResp { //public class OrderResp {
/*** "订单编号"***/ // /*** "订单编号"***/
private String orderCode; // private String orderCode;
//
/*** "父订单编号"***/ // /*** "父订单编号"***/
private String parentCode; // private String parentCode;
//
/*** "商户号"***/ // /*** "商户号"***/
private String partnerId; // private String partnerId;
//
/*** "商户名"***/ // /*** "商户名"***/
private String partnerName; // private String partnerName;
//
/*** "门店编号"***/ // /*** "门店编号"***/
private String storeId; // private String storeId;
//
/*** "第三方门店编号"***/ // /*** "第三方门店编号"***/
private String thirdStoreId; // private String thirdStoreId;
//
/*** "门店名"***/ // /*** "门店名"***/
private String storeName; // private String storeName;
//
/*** "门店全局唯一编号"***/ // /*** "门店全局唯一编号"***/
private String storeUnifyId; // private String storeUnifyId;
//
/*** "目的门店"***/ // /*** "目的门店"***/
private String toStoreId; // private String toStoreId;
//
/*** "用户ID"***/ // /*** "用户ID"***/
private String userId; // private String userId;
//
/*** "用户姓名"***/ // /*** "用户姓名"***/
private String userName; // private String userName;
//
/*** OrderStatus.API_DESC***/ // /*** OrderStatus.API_DESC***/
private Byte orderState; // private Byte orderState;
//
/*** "订单子状态"***/ // /*** "订单子状态"***/
private Integer orderSubState; // private Integer orderSubState;
//
/*** OrderType.API_DESC***/ // /*** OrderType.API_DESC***/
private Byte orderType; // private Byte orderType;
//
/*** PayStatus.API_DESC***/ // /*** PayStatus.API_DESC***/
private Byte payState; // private Byte payState;
//
/*** PayType.API_DESC***/ // /*** PayType.API_DESC***/
private Byte payType; // private Byte payType;
//
/*** "当前支付请求号"***/ // /*** "当前支付请求号"***/
private String payRequestNo; // private String payRequestNo;
//
/*** "最新的售后单的状态"***/ // /*** "最新的售后单的状态"***/
private Byte afterSalesState; // private Byte afterSalesState;
//
//
/*** "支付渠道"***/ // /*** "支付渠道"***/
private String payChannel; // private String payChannel;
//
/*** "支付渠道名称"***/ // /*** "支付渠道名称"***/
private String payChannelName; // private String payChannelName;
//
/*** OrderDeliveryStatus.API_DESC***/ // /*** OrderDeliveryStatus.API_DESC***/
private Integer deliveryState; // private Integer deliveryState;
//
/*** OrderDispenseStatus.API_DESC***/ // /*** OrderDispenseStatus.API_DESC***/
private Integer dispenseStatus; // private Integer dispenseStatus;
//
/*** "订单原始金额，单位分"***/ // /*** "订单原始金额，单位分"***/
private BigDecimal originalAmount; // private BigDecimal originalAmount;
//
/*** "用户在界面上看到的支付金额"***/ // /*** "用户在界面上看到的支付金额"***/
private BigDecimal settlementAmount; // private BigDecimal settlementAmount;
//
/*** "实际支付现金金额，扣除支付自生优惠，单位分"***/ // /*** "实际支付现金金额，扣除支付自生优惠，单位分"***/
private BigDecimal actualPayAmount; // private BigDecimal actualPayAmount;
//
/*** "是否需要开发票"***/ // /*** "是否需要开发票"***/
private Boolean needInvoice; // private Boolean needInvoice;
//
/*** "是否立即送达"***/ // /*** "是否立即送达"***/
private Boolean immediately; // private Boolean immediately;
//
/*** OrderClientType.API_DESC***/ // /*** OrderClientType.API_DESC***/
private Byte orderClient; // private Byte orderClient;
//
/*** "商户自己生成的订单号"***/ // /*** "商户自己生成的订单号"***/
private String companySelfCode; // private String companySelfCode;
//
/*** "第三方订单号"***/ // /*** "第三方订单号"***/
private String thirdOrderCode; // private String thirdOrderCode;
//
/*** "订单备注"***/ // /*** "订单备注"***/
private String note; // private String note;
//
/*** "取消原因"***/ // /*** "取消原因"***/
private String cancelReason; // private String cancelReason;
//
/*** "取货号 取餐号"***/ // /*** "取货号 取餐号"***/
private String pickUpGoodsNo; // private String pickUpGoodsNo;
//
/*** OrderMarketType.API_DESC***/ // /*** OrderMarketType.API_DESC***/
private Byte marketingType; // private Byte marketingType;
//
/*** "销售类型对应的场景值"***/ // /*** "销售类型对应的场景值"***/
private String marketingCode; // private String marketingCode;
//
/*** "配送类型 1自配送(三方渠道配送、商家店员配送** 2平台配送"***/ // /*** "配送类型 1自配送(三方渠道配送、商家店员配送** 2平台配送"***/
private Byte expressType; // private Byte expressType;
//
/*** "配送渠道名称"***/ // /*** "配送渠道名称"***/
private String expressChannelName; // private String expressChannelName;
//
/*** "配送渠道编号"***/ // /*** "配送渠道编号"***/
private String expressChannelCode; // private String expressChannelCode;
//
/*** "快递单号"***/ // /*** "快递单号"***/
private String expressNo; // private String expressNo;
//
/*** "重量"***/ // /*** "重量"***/
private BigDecimal weight; // private BigDecimal weight;
//
/*** "是否能退货 是否有退货商品"***/ // /*** "是否能退货 是否有退货商品"***/
private Boolean canRefund; // private Boolean canRefund;
//
/*** "支付时间"***/ // /*** "支付时间"***/
private Date payTime; // private Date payTime;
//
/*** "发货时间"***/ // /*** "发货时间"***/
private Date deliveryTime; // private Date deliveryTime;
//
/*** "签收时间 送达时间 收货时间"***/ // /*** "签收时间 送达时间 收货时间"***/
private Date receiveTime; // private Date receiveTime;
//
/*** "打印时间"***/ // /*** "打印时间"***/
private Date printTime; // private Date printTime;
//
/*** "接单时间"***/ // /*** "接单时间"***/
private Date acceptTime; // private Date acceptTime;
//
/*** "实际到达时间"***/ // /*** "实际到达时间"***/
private Date actualArrivalTime; // private Date actualArrivalTime;
//
/*** "捡货时间（制作完成发货的时间）"***/ // /*** "捡货时间（制作完成发货的时间）"***/
private Date pickUpTime; // private Date pickUpTime;
//
/*** "桌台号"***/ // /*** "桌台号"***/
private String barCounter; // private String barCounter;
//
/*** "pos编号"***/ // /*** "pos编号"***/
private String posCode; // private String posCode;
//
/*** "就餐人数"***/ // /*** "就餐人数"***/
private Integer dinersNumber; // private Integer dinersNumber;
//
/*** "小程序本地tableKey"***/ // /*** "小程序本地tableKey"***/
private String localTableKey; // private String localTableKey;
//
/*** "pos table key"***/ // /*** "pos table key"***/
private String posTableKey; // private String posTableKey;
//
/*** "预约时间"***/ // /*** "预约时间"***/
private Date expectTime; // private Date expectTime;
//
/*** "挂起状态 0 正常 1 未成团挂起 2 风控挂起 3 售后挂起"***/ // /*** "挂起状态 0 正常 1 未成团挂起 2 风控挂起 3 售后挂起"***/
private Byte suspendState; // private Byte suspendState;
//
/*** "挂起描述"***/ // /*** "挂起描述"***/
private String suspendDesc; // private String suspendDesc;
//
/*** OrderAbnormalStatus.API_DESC***/ // /*** OrderAbnormalStatus.API_DESC***/
private Byte abnormalState; // private Byte abnormalState;
//
/*** "订单异常具体描述"***/ // /*** "订单异常具体描述"***/
private String abnormalDesc; // private String abnormalDesc;
//
/*** "打印次数"***/ // /*** "打印次数"***/
private Integer printNum; // private Integer printNum;
//
//
/*** "创建时间"***/ // /*** "创建时间"***/
private Date createTime; // private Date createTime;
//
/*** "更新时间"***/ // /*** "更新时间"***/
private Date updateTime; // private Date updateTime;
//
/*** "发票明细"***/ // /*** "发票明细"***/
private OrderInvoiceResp orderInvoice; // private OrderInvoiceResp orderInvoice;
//
/*** "扩展字段"***/ // /*** "扩展字段"***/
private String extInfo; // private String extInfo;
//
/*** OrderBizType.API_DESC***/ // /*** OrderBizType.API_DESC***/
private Byte bizType; // private Byte bizType;
//
/*** "下单区域"***/ // /*** "下单区域"***/
private String orderArea; // private String orderArea;
//
/*** "承诺送达标识 0-无承诺 60-1小时达 120-2小时达 180-3小时达 1440-隔日达"***/ // /*** "承诺送达标识 0-无承诺 60-1小时达 120-2小时达 180-3小时达 1440-隔日达"***/
private Short deliveryPromise; // private Short deliveryPromise;
//
/*** "预计送达时间"***/ // /*** "预计送达时间"***/
private Date estimateDeliveryCompleteTime; // private Date estimateDeliveryCompleteTime;
//
/*** "订单商品信息"***/ // /*** "订单商品信息"***/
List<OrderItemResp> orderItemList; // List<OrderItemResp> orderItemList;
//
/*** "订单费用信息"***/ // /*** "订单费用信息"***/
List<OrderCostResp> orderCostDetailList; // List<OrderCostResp> orderCostDetailList;
//
/*** "订单结算信息"***/ // /*** "订单结算信息"***/
List<OrderSettlementResp> orderSettlementDetailList; // List<OrderSettlementResp> orderSettlementDetailList;
//
/*** "配送联系信息"***/ // /*** "配送联系信息"***/
List<DeliveryContactInfoResp> deliveryContactInfoList; // List<DeliveryContactInfoResp> deliveryContactInfoList;
//
/*** "售后单信息"***/ // /*** "售后单信息"***/
List<AfterSalesOrderResp> afterSalesOrderList; // List<AfterSalesOrderResp> afterSalesOrderList;
//
/*** "订单操作历史"***/ // /*** "订单操作历史"***/
List<OrderOperationHistoryResp> orderOperationHistoryList; // List<OrderOperationHistoryResp> orderOperationHistoryList;
//
/*** "订单扩展信息"***/ // /*** "订单扩展信息"***/
private OrderExtendedReq orderExtended; // private OrderExtendedReq orderExtended;
//
/*** "门店当天订单计数"***/ // /*** "门店当天订单计数"***/
private Integer daySeq; // private Integer daySeq;
//
/*** "是否为父订单"***/ // /*** "是否为父订单"***/
private Boolean isParent; // private Boolean isParent;
//
/*** "订单来源 "+SourceType.API_DESC***/ // /*** "订单来源 "+SourceType.API_DESC***/
private Byte sourceType; // private Byte sourceType;
//
/*** "下单渠道appId"***/ // /*** "下单渠道appId"***/
private String appId; // private String appId;
//
/*** "下游POS商编号"***/ // /*** "下游POS商编号"***/
private String downstreamPosCode; // private String downstreamPosCode;
//
/*** "下游订单号"***/ // /*** "下游订单号"***/
private String downstreamThirdOrderCode; // private String downstreamThirdOrderCode;
//
/*** "订单支付渠道类型" +PayChannelType.API_DESC***/ // /*** "订单支付渠道类型" +PayChannelType.API_DESC***/
private Byte payChannelType; // private Byte payChannelType;
} //}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
package com.freemud.application.sdk.api.ordercenter.response.orderInfo; 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.OrderExtendedReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderTraceInfoResp;
import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp; import com.freemud.application.sdk.api.ordercenter.response.OrderPayItemResp;
import lombok.Data; import lombok.Data;
...@@ -360,85 +359,87 @@ public class OrderInfoReqs { ...@@ -360,85 +359,87 @@ public class OrderInfoReqs {
* 预计送达时间 * 预计送达时间
*/ */
private String estimateDeliveryCompleteTime; 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 OrderInvoice orderInvoice;
private Integer dispenseStatus;
/** /**
* 是否立即送达 * 订单商品信息
*/ */
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 List<OrderPayItemResp> orderPayItemCreateReqList;
private String appId; private List<OrderSendCouponResp> orderSendCouponRespList;
List<OrderSendCouponResp> orderSendCouponRespList;
/**
* 操作人
*/
private String operator;
} }
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; ...@@ -2,7 +2,6 @@ package com.freemud.application.sdk.api.ordercenter.service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.application.sdk.api.base.BaseRequest; import com.freemud.application.sdk.api.base.BaseRequest;
import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties; import com.freemud.application.sdk.api.ordercenter.config.OrderCenterProperties;
import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant; import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
...@@ -17,7 +16,6 @@ import com.freemud.application.sdk.api.ordercenter.request.create.BatchQueryByCo ...@@ -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.CreateFatherSonOrderReq;
import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest; 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.*;
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.AfterSalesOrderResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse;
...@@ -31,7 +29,10 @@ import org.springframework.core.ParameterizedTypeReference; ...@@ -31,7 +29,10 @@ import org.springframework.core.ParameterizedTypeReference;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate; 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.*; import static com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant.*;
/** /**
...@@ -830,8 +831,8 @@ public class OrderSdkService { ...@@ -830,8 +831,8 @@ public class OrderSdkService {
* 停车场 创建订单 * 停车场 创建订单
*/ */
public BaseResponse parking_v2_create(ParkingOrderCreateReq request, String trackingNo) { public BaseResponse parking_v2_create(ParkingOrderCreateReq request, String trackingNo) {
OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CREATE, OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CREATE,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() { createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
}); });
return responseHandle(responseDTO); return responseHandle(responseDTO);
} }
...@@ -842,8 +843,8 @@ public class OrderSdkService { ...@@ -842,8 +843,8 @@ public class OrderSdkService {
* 完成停车订单 * 完成停车订单
*/ */
public BaseResponse parking_v2_affirm(ParkingOrderAffirmReq request, String trackingNo) { public BaseResponse parking_v2_affirm(ParkingOrderAffirmReq request, String trackingNo) {
OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_AFFIRM, OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_AFFIRM,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() { createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
}); });
return responseHandle(responseDTO); return responseHandle(responseDTO);
} }
...@@ -853,8 +854,8 @@ public class OrderSdkService { ...@@ -853,8 +854,8 @@ public class OrderSdkService {
* 审核不通过 * 审核不通过
*/ */
public BaseResponse parking_v2_cancel(ParkingOrderCancelReq request, String trackingNo) { public BaseResponse parking_v2_cancel(ParkingOrderCancelReq request, String trackingNo) {
OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CANCEL, OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_CANCEL,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() { createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
}); });
return responseHandle(responseDTO); return responseHandle(responseDTO);
} }
...@@ -877,8 +878,8 @@ public class OrderSdkService { ...@@ -877,8 +878,8 @@ public class OrderSdkService {
* 撤单 * 撤单
*/ */
public BaseResponse parkingOrderRevoke(ParkingOrderRevokeReq request, String trackingNo) { public BaseResponse parkingOrderRevoke(ParkingOrderRevokeReq request, String trackingNo) {
OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_REVOKE, OrderBaseResp<OrderInfoReqs> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_REVOKE,
createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() { createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderInfoReqs>>() {
}); });
return responseHandle(responseDTO); return responseHandle(responseDTO);
} }
......
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