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
e0469f56
Commit
e0469f56
authored
Apr 07, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
月享卡不展示标签
parent
3c1fa6fe
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
1 deletions
+8
-1
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
+1
-0
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
+2
-0
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+5
-1
No files found.
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
View file @
e0469f56
...
@@ -968,6 +968,7 @@ public class OrderSdkAdapter {
...
@@ -968,6 +968,7 @@ public class OrderSdkAdapter {
productDiscount
.
setCustomerCode
(
""
);
productDiscount
.
setCustomerCode
(
""
);
productDiscount
.
setAddInfo
(
orderSettlementResp
.
getExtInfo
());
productDiscount
.
setAddInfo
(
orderSettlementResp
.
getExtInfo
());
productDiscount
.
setProductId
(
orderSettlementResp
.
getProductId
());
productDiscount
.
setProductId
(
orderSettlementResp
.
getProductId
());
productDiscount
.
setExtInfo
(
orderSettlementResp
.
getExtInfo
());
discountList
.
add
(
productDiscount
);
discountList
.
add
(
productDiscount
);
}
}
}
}
...
...
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
View file @
e0469f56
...
@@ -716,6 +716,8 @@ public class QueryOrdersResponse {
...
@@ -716,6 +716,8 @@ public class QueryOrdersResponse {
private
String
addInfo
;
private
String
addInfo
;
private
String
productId
;
private
String
productId
;
private
String
extInfo
;
}
}
@NoArgsConstructor
@NoArgsConstructor
...
...
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
e0469f56
...
@@ -2179,7 +2179,11 @@ public class OrderAdapter {
...
@@ -2179,7 +2179,11 @@ public class OrderAdapter {
discountTotalAmount
=
discountTotalAmount
+
productDiscount
.
getDiscountAmount
()*
productDiscount
.
getDiscountQty
();
discountTotalAmount
=
discountTotalAmount
+
productDiscount
.
getDiscountAmount
()*
productDiscount
.
getDiscountQty
();
if
(
OrderAccountType
.
PRODUCT_COUPON
.
getCode
().
equals
(
productDiscount
.
getDiscountType
()))
{
if
(
OrderAccountType
.
PRODUCT_COUPON
.
getCode
().
equals
(
productDiscount
.
getDiscountType
()))
{
hasProductCoupon
=
true
;
hasProductCoupon
=
true
;
productVo
.
setCouponName
(
productDiscount
.
getDiscountDesc
());
JSONObject
productDiscountExtInfo
=
JSON
.
parseObject
(
productDiscount
.
getExtInfo
());
Integer
extendType
=
productDiscountExtInfo
.
getInteger
(
"extendType"
);
if
(
null
==
extendType
||
extendType
!=
5
)
{
productVo
.
setCouponName
(
productDiscount
.
getDiscountDesc
());
}
}
}
if
(
OrderAccountType
.
BUYM_SENDN
.
getCode
().
equals
(
productDiscount
.
getDiscountType
()))
{
if
(
OrderAccountType
.
BUYM_SENDN
.
getCode
().
equals
(
productDiscount
.
getDiscountType
()))
{
activityType
=
ActivityTypeEnum
.
TYPE_61
.
getCode
();
activityType
=
ActivityTypeEnum
.
TYPE_61
.
getCode
();
...
...
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