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
09ffc732
Commit
09ffc732
authored
Mar 31, 2021
by
chongfu.liang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
单品立减
parent
35949de9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
2 deletions
+13
-2
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+7
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
+2
-1
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 @
09ffc732
...
...
@@ -1413,9 +1413,12 @@ public class OrderSdkAdapter {
case
"COCO_PRODUCT_CASH_COUPON"
:
type
=
36
;
break
;
case
"
FULL_BUYM_SEND
N"
:
case
"
SINGLE_PRODUCT_REDUCTIO
N"
:
type
=
230
;
break
;
case
"FULL_BUYM_SENDN"
:
type
=
22
;
break
;
default
:
break
;
}
...
...
@@ -2032,6 +2035,9 @@ public class OrderSdkAdapter {
case
230
:
newOrderAccountType
=
OldOrderAccountType
.
FULL_BUYM_SENDN
.
getCode
();
break
;
case
22
:
newOrderAccountType
=
OldOrderAccountType
.
SINGLE_PRODUCT_REDUCTION
.
getCode
();
break
;
default
:
break
;
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
View file @
09ffc732
...
...
@@ -46,7 +46,8 @@ public enum OldOrderAccountType {
GATHER_SPOT
(
221
,
"集点活动"
,
"GATHER_SPOT"
),
MEMBER_PRICE_DISCOUNT
(
220
,
"会员价优惠"
,
"MEMBER_PRICE_DISCOUNT"
),
COCO_PRODUCT_CASH_COUPON
(
36
,
"coco商品代金券"
,
"COCO_PRODUCT_CASH_COUPON"
),
FULL_BUYM_SENDN
(
230
,
"满赠"
,
"FULL_BUYM_SENDN"
);
FULL_BUYM_SENDN
(
230
,
"满赠"
,
"FULL_BUYM_SENDN"
),
SINGLE_PRODUCT_REDUCTION
(
22
,
"单品立减"
,
"SINGLE_PRODUCT_REDUCTION"
);
private
Integer
code
;
private
String
desc
;
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
09ffc732
...
...
@@ -2664,6 +2664,9 @@ public class OrderAdapter {
if
(
ActivityTypeEnum
.
TYPE_221
.
getCode
().
equals
(
activityType
)){
return
OldOrderAccountType
.
GATHER_SPOT
;
}
if
(
ActivityTypeEnum
.
TYPE_22
.
getCode
().
equals
(
activityType
)){
return
OldOrderAccountType
.
SINGLE_PRODUCT_REDUCTION
;
}
// coco商品代金券
if
(
ActivityTypeEnum
.
TYPE_36
.
getCode
().
equals
(
activityType
)){
...
...
order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
View file @
09ffc732
...
...
@@ -24,6 +24,7 @@ public enum ActivityTypeEnum {
*/
TYPE_2
(
2
,
"单品特价"
),
TYPE_21
(
21
,
"单品折扣"
),
TYPE_22
(
22
,
"单品立减"
),
/**
* 优惠券
*/
...
...
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