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
c5cf201c
Commit
c5cf201c
authored
Oct 13, 2020
by
缪晖
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单聚合添加订单基础marketingType字段透传
parent
557f26b1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
1 deletions
+15
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+3
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+5
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-0
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+5
-0
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
+1
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
c5cf201c
...
...
@@ -1060,6 +1060,9 @@ public class OrderSdkAdapter {
//发票信息
data
.
setOrderInvoice
(
orderInfoReqs
.
getOrderInvoice
());
//订单类型回传
data
.
setMarketingType
(
orderInfoReqs
.
getMarketingType
());
return
data
;
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
c5cf201c
...
...
@@ -239,6 +239,11 @@ public class QueryOrdersResponse {
*/
private
String
thirdOrderCode
;
/**
* 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
*/
private
Integer
marketingType
;
/**
* 退款信息
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
c5cf201c
...
...
@@ -1234,6 +1234,7 @@ public class OrderAdapter {
if
(
enableRefundCodes
.
contains
(
ordersBean
.
getStatus
())
&&
PayStatus
.
HAVE_PAID
.
getCode
().
equals
(
ordersBean
.
getPayStatus
()))
{
responseVo
.
setEnableRefund
(
true
);
}
responseVo
.
setMarketingType
(
ordersBean
.
getMarketingType
());
list
.
add
(
responseVo
);
});
return
list
;
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
c5cf201c
...
...
@@ -360,6 +360,11 @@ public class QueryOrderResponseVo {
*/
private
String
downstreamThirdOrderCode
;
/**
* 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
*/
private
Integer
marketingType
;
@Data
public
static
class
OrderStatusFlow
{
/**
...
...
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
View file @
c5cf201c
...
...
@@ -158,7 +158,7 @@ public class OrderInfoReqs {
//门店订单序号
private
Integer
daySeq
;
//订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单
//订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单
4:拼单订单
private
Integer
marketingType
;
//销售类型对应的场景值
...
...
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