Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
f8081797
Commit
f8081797
authored
Nov 29, 2020
by
刘鹏飞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单查询增加买一赠一寄件送券的返参
parent
e317d086
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
80 additions
and
4 deletions
+80
-4
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+2
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+3
-4
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
+2
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderSendCouponResp.java
+73
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
f8081797
...
...
@@ -1178,6 +1178,8 @@ public class OrderSdkAdapter {
data
.
setExpressChannelName
(
orderInfoReqs
.
getExpressChannelName
());
//发票信息
data
.
setOrderInvoice
(
orderInfoReqs
.
getOrderInvoice
());
// 买一赠一寄件信息
data
.
setOrderSendCouponRespList
(
orderInfoReqs
.
getOrderSendCouponRespList
());
return
data
;
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
f8081797
...
...
@@ -12,11 +12,8 @@
*/
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.OrderInvoice
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderSettlementResp
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.apache.commons.lang.builder.ToStringBuilder
;
...
...
@@ -262,6 +259,8 @@ public class QueryOrdersResponse {
private
List
<
OrderSettlementResp
>
orderSettlementDetailList
;
List
<
OrderSendCouponResp
>
orderSendCouponRespList
;
private
AddDeliveryInfo
addInfo
;
/**
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
View file @
f8081797
...
...
@@ -271,4 +271,6 @@ public class OrderInfoReqs {
//支付渠道类型
private
String
payChannelType
;
List
<
OrderSendCouponResp
>
orderSendCouponRespList
;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderSendCouponResp.java
0 → 100644
View file @
f8081797
/**
* 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
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment