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
9224d133
Commit
9224d133
authored
Oct 13, 2020
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
运费券下单
parent
63fdf2d3
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
0 deletions
+9
-0
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/enums/OldOrderAccountType.java
+1
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java
+1
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+3
-0
order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
+1
-0
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
9224d133
...
@@ -1264,6 +1264,9 @@ public class OrderSdkAdapter {
...
@@ -1264,6 +1264,9 @@ public class OrderSdkAdapter {
case
"COUPON"
:
case
"COUPON"
:
type
=
10
;
type
=
10
;
break
;
break
;
case
"FREIGHT_COUPON"
:
type
=
99
;
break
;
case
"PRODUCT_COUPON"
:
case
"PRODUCT_COUPON"
:
type
=
118
;
type
=
118
;
break
;
break
;
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
View file @
9224d133
...
@@ -23,6 +23,7 @@ public enum OldOrderAccountType {
...
@@ -23,6 +23,7 @@ public enum OldOrderAccountType {
PRODUCT_COUPON
(
6
,
"商品券"
,
"PRODUCT_COUPON"
),
PRODUCT_COUPON
(
6
,
"商品券"
,
"PRODUCT_COUPON"
),
DISCOUNT_COUPON
(
7
,
"折扣券"
,
"DISCOUNT_COUPON"
),
DISCOUNT_COUPON
(
7
,
"折扣券"
,
"DISCOUNT_COUPON"
),
DRIVER_FEE
(
7
,
"骑手小费"
,
"DRIVER_FEE"
),
DRIVER_FEE
(
7
,
"骑手小费"
,
"DRIVER_FEE"
),
FREIGHT_COUPON
(
99
,
"运费券"
,
"FREIGHT_COUPON"
),
DISCOUNT_AMOUNT
(
21
,
"限时折扣"
,
"DISCOUNT_AMOUNT"
),
DISCOUNT_AMOUNT
(
21
,
"限时折扣"
,
"DISCOUNT_AMOUNT"
),
PREMIUM_EXCHANGE
(
22
,
"加价购"
,
"PREMIUM_EXCHANGE"
),
PREMIUM_EXCHANGE
(
22
,
"加价购"
,
"PREMIUM_EXCHANGE"
),
SECOND_DISCOUNT
(
23
,
"第二件N折"
,
"SECOND_DISCOUNT"
),
SECOND_DISCOUNT
(
23
,
"第二件N折"
,
"SECOND_DISCOUNT"
),
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java
View file @
9224d133
...
@@ -22,6 +22,7 @@ public enum QueryOrderAccountType {
...
@@ -22,6 +22,7 @@ public enum QueryOrderAccountType {
BUY_DISCOUNT
(
"BUY_DISCOUNT"
,
"满减优惠"
),
BUY_DISCOUNT
(
"BUY_DISCOUNT"
,
"满减优惠"
),
PACK_AMOUNT
(
"PACK_AMOUNT"
,
"包装费"
),
PACK_AMOUNT
(
"PACK_AMOUNT"
,
"包装费"
),
COUPON
(
"COUPON"
,
"代金券"
),
COUPON
(
"COUPON"
,
"代金券"
),
FREIGHT_COUPON
(
"FREIGHT_COUPON"
,
"运费券"
),
PRODUCT_COUPON
(
"PRODUCT_COUPON"
,
"商品券"
),
PRODUCT_COUPON
(
"PRODUCT_COUPON"
,
"商品券"
),
DISCOUNT_COUPON
(
"DISCOUNT_COUPON"
,
"折扣券"
),
DISCOUNT_COUPON
(
"DISCOUNT_COUPON"
,
"折扣券"
),
DISCOUNT_AMOUNT
(
"DISCOUNT_AMOUNT"
,
"限时折扣金额"
),
DISCOUNT_AMOUNT
(
"DISCOUNT_AMOUNT"
,
"限时折扣金额"
),
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
9224d133
...
@@ -2296,6 +2296,9 @@ public class OrderAdapter {
...
@@ -2296,6 +2296,9 @@ public class OrderAdapter {
if
(
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
activityType
))
{
if
(
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
activityType
))
{
return
OldOrderAccountType
.
PRODUCT_COUPON
;
return
OldOrderAccountType
.
PRODUCT_COUPON
;
}
}
if
(
ActivityTypeEnum
.
TYPE_34
.
getCode
().
equals
(
activityType
))
{
return
OldOrderAccountType
.
FREIGHT_COUPON
;
}
if
(
ActivityTypeEnum
.
TYPE_31
.
getCode
().
equals
(
activityType
))
{
if
(
ActivityTypeEnum
.
TYPE_31
.
getCode
().
equals
(
activityType
))
{
return
OldOrderAccountType
.
DISCOUNT_COUPON
;
return
OldOrderAccountType
.
DISCOUNT_COUPON
;
}
}
...
...
order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
View file @
9224d133
...
@@ -30,6 +30,7 @@ public enum ActivityTypeEnum {
...
@@ -30,6 +30,7 @@ public enum ActivityTypeEnum {
TYPE_3
(
3
,
"代金券"
),
TYPE_3
(
3
,
"代金券"
),
TYPE_31
(
31
,
"折扣券"
),
TYPE_31
(
31
,
"折扣券"
),
TYPE_32
(
32
,
"商品券"
),
TYPE_32
(
32
,
"商品券"
),
TYPE_34
(
34
,
"运费券"
),
TYPE_5
(
5
,
"整单满金额折"
),
TYPE_5
(
5
,
"整单满金额折"
),
TYPE_51
(
51
,
"每满金额折"
),
TYPE_51
(
51
,
"每满金额折"
),
TYPE_52
(
52
,
"阶梯满金额折"
),
TYPE_52
(
52
,
"阶梯满金额折"
),
...
...
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