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
c9abd336
Commit
c9abd336
authored
Feb 25, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复问题
parent
b1718f0d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
1 deletions
+13
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+6
-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
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
+1
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
c9abd336
...
...
@@ -1341,6 +1341,9 @@ public class OrderSdkAdapter {
case
"PRODUCT_COUPON"
:
type
=
118
;
break
;
case
"SEED_PRODUCT_COUPON"
:
type
=
37
;
break
;
case
"DISCOUNT_COUPON"
:
type
=
208
;
break
;
...
...
@@ -1963,6 +1966,9 @@ public class OrderSdkAdapter {
case
118
:
newOrderAccountType
=
OldOrderAccountType
.
PRODUCT_COUPON
.
getCode
();
break
;
case
37
:
newOrderAccountType
=
OldOrderAccountType
.
SEED_PRODUCT_COUPON
.
getCode
();
break
;
case
208
:
newOrderAccountType
=
OldOrderAccountType
.
DISCOUNT_COUPON
.
getCode
();
break
;
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
View file @
c9abd336
...
...
@@ -22,6 +22,7 @@ public enum OldOrderAccountType {
PACK_AMOUNT
(
3
,
"包装费"
,
"PACK_AMOUNT"
),
COUPON
(
5
,
"代金券"
,
"COUPON"
),
PRODUCT_COUPON
(
6
,
"商品券"
,
"PRODUCT_COUPON"
),
SEED_PRODUCT_COUPON
(
37
,
"种子券"
,
"SEED_PRODUCT_COUPON"
),
DISCOUNT_COUPON
(
7
,
"折扣券"
,
"DISCOUNT_COUPON"
),
DRIVER_FEE
(
7
,
"骑手小费"
,
"DRIVER_FEE"
),
WITH_ORDER_BUY_COUPON_FEE
(
10
,
"随单买月卡"
,
"WITH_ORDER_BUY_COUPON_FEE"
),
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/QueryOrderAccountType.java
View file @
c9abd336
...
...
@@ -24,6 +24,7 @@ public enum QueryOrderAccountType {
COUPON
(
"COUPON"
,
"代金券"
),
FREIGHT_COUPON
(
"FREIGHT_COUPON"
,
"运费券"
),
PRODUCT_COUPON
(
"PRODUCT_COUPON"
,
"商品券"
),
SEED_PRODUCT_COUPON
(
"SEED_PRODUCT_COUPON"
,
"种子券"
),
DISCOUNT_COUPON
(
"DISCOUNT_COUPON"
,
"折扣券"
),
DISCOUNT_AMOUNT
(
"DISCOUNT_AMOUNT"
,
"限时折扣金额"
),
PREMIUM_EXCHANGE
(
"PREMIUM_EXCHANGE"
,
"加价购"
),
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
c9abd336
...
...
@@ -2589,6 +2589,9 @@ public class OrderAdapter {
if
(
ActivityTypeEnum
.
TYPE_32
.
getCode
().
equals
(
activityType
))
{
return
OldOrderAccountType
.
PRODUCT_COUPON
;
}
if
(
ActivityTypeEnum
.
TYPE_37
.
getCode
().
equals
(
activityType
))
{
return
OldOrderAccountType
.
SEED_PRODUCT_COUPON
;
}
if
(
ActivityTypeEnum
.
TYPE_34
.
getCode
().
equals
(
activityType
))
{
return
OldOrderAccountType
.
FREIGHT_COUPON
;
}
...
...
order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
View file @
c9abd336
...
...
@@ -32,6 +32,7 @@ public enum ActivityTypeEnum {
TYPE_32
(
32
,
"商品券"
),
TYPE_34
(
34
,
"运费券"
),
TYPE_35
(
35
,
"买1赠3券"
),
TYPE_37
(
37
,
"种子券"
),
TYPE_5
(
5
,
"整单满金额折"
),
TYPE_51
(
51
,
"每满金额折"
),
TYPE_52
(
52
,
"阶梯满金额折"
),
...
...
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
View file @
c9abd336
...
...
@@ -1638,7 +1638,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
for
(
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
ProductBean
productBean
:
orderBean
.
getProductList
())
{
if
(!
ProductTypeEnum
.
getVirtualProductType
().
contains
(
productBean
.
getProductType
())
&&
CollectionUtils
.
isNotEmpty
(
productBean
.
getDiscountList
()))
{
for
(
QueryOrdersResponseDto
.
DataBean
.
OrderBean
.
ProductBean
.
ProductDiscount
discount
:
productBean
.
getDiscountList
())
{
if
(
null
!=
discount
.
getDiscountType
()
&&
OldOrderAccountType
.
PRODUCT_COUPON
.
getCode
().
equals
(
discount
.
getDiscountType
())
if
(
null
!=
discount
.
getDiscountType
()
&&
OldOrderAccountType
.
SEED_
PRODUCT_COUPON
.
getCode
().
equals
(
discount
.
getDiscountType
())
&&
defaultCardCodes
.
contains
(
discount
.
getDiscountId
()))
{
UpdateCouponCodeReq
.
CouponUpdateInfo
couponUpdateInfo
=
new
UpdateCouponCodeReq
.
CouponUpdateInfo
();
couponUpdateInfo
.
setProductSeq
(
productBean
.
getSequence
());
...
...
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