Commit f8081797 by 刘鹏飞

订单查询增加买一赠一寄件送券的返参

parent e317d086
...@@ -1178,6 +1178,8 @@ public class OrderSdkAdapter { ...@@ -1178,6 +1178,8 @@ public class OrderSdkAdapter {
data.setExpressChannelName(orderInfoReqs.getExpressChannelName()); data.setExpressChannelName(orderInfoReqs.getExpressChannelName());
//发票信息 //发票信息
data.setOrderInvoice(orderInfoReqs.getOrderInvoice()); data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
// 买一赠一寄件信息
data.setOrderSendCouponRespList(orderInfoReqs.getOrderSendCouponRespList());
return data; return data;
} }
......
...@@ -12,11 +12,8 @@ ...@@ -12,11 +12,8 @@
*/ */
package com.freemud.sdk.api.assortment.order.response.order; package com.freemud.sdk.api.assortment.order.response.order;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp; import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInvoice;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringBuilder;
...@@ -262,6 +259,8 @@ public class QueryOrdersResponse { ...@@ -262,6 +259,8 @@ public class QueryOrdersResponse {
private List<OrderSettlementResp> orderSettlementDetailList; private List<OrderSettlementResp> orderSettlementDetailList;
List<OrderSendCouponResp> orderSendCouponRespList;
private AddDeliveryInfo addInfo; private AddDeliveryInfo addInfo;
/** /**
......
...@@ -271,4 +271,6 @@ public class OrderInfoReqs { ...@@ -271,4 +271,6 @@ public class OrderInfoReqs {
//支付渠道类型 //支付渠道类型
private String payChannelType; private String payChannelType;
List<OrderSendCouponResp> orderSendCouponRespList;
} }
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: OrderSettlementResp
* @Package com.freemud.application.sdk.api.ordercenter.response.orderInfo
* @Description:
* @author: ping.wu
* @date: 2019/4/2 17:32
* @version V1.0
* @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
* 注意:本内容仅限于上海非码科技内部传阅,禁止外泄以及用于其他的商业目
*/
package com.freemud.application.sdk.api.ordercenter.response.orderInfo;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class OrderSendCouponResp {
/**
* 商户ID
*/
private String partnerId;
/**
* 门店ID
*/
private String storeId;
/**
* 订单id
*/
private Long orderId;
/**
* 订单编码
*/
private String orderCode;
/**
* 活动编号
*/
private String activeCode;
/**
* 活动类型
*/
private String activeType;
/**
* 商品SKU,商品服务唯一标识
*/
private String goodsId;
/**
* 商品名称
*/
private String goodsName;
/**
* 券
*/
private String coupon;
/**
* 券码
*/
private String couponCode;
private Integer couponCodeStatus;
}
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