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
1fd51752
Commit
1fd51752
authored
Apr 02, 2021
by
徐康
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加字段
parent
3c1fa6fe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+2
-1
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
+4
-0
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
1fd51752
...
@@ -311,7 +311,7 @@ public class OrderAdapter {
...
@@ -311,7 +311,7 @@ public class OrderAdapter {
if
(
shoppingCartGoodsDto
.
getMonthCardDiscount
()
!=
null
&&
shoppingCartGoodsDto
.
getMonthCardDiscount
().
getDiscountAmount
()
!=
0
)
{
if
(
shoppingCartGoodsDto
.
getMonthCardDiscount
()
!=
null
&&
shoppingCartGoodsDto
.
getMonthCardDiscount
().
getDiscountAmount
()
!=
0
)
{
CreateOrderAccountRequest
createOrderAccountDto
=
CreateOrderAccountRequest
.
builder
()
CreateOrderAccountRequest
createOrderAccountDto
=
CreateOrderAccountRequest
.
builder
()
.
accountId
(
""
)
.
accountId
(
""
)
.
name
(
"月享卡优惠总金额"
)
.
name
(
shoppingCartGoodsDto
.
getMonthCardDiscount
().
getDiscountDesc
()
)
.
price
(
shoppingCartGoodsDto
.
getMonthCardDiscount
().
getDiscountAmount
())
.
price
(
shoppingCartGoodsDto
.
getMonthCardDiscount
().
getDiscountAmount
())
.
accountType
(
QueryOrderAccountType
.
MONTH_CARD_TOTAL_DISCOUNT
)
.
accountType
(
QueryOrderAccountType
.
MONTH_CARD_TOTAL_DISCOUNT
)
.
sequence
(
orderAccountIndex
++)
.
sequence
(
orderAccountIndex
++)
...
@@ -1398,6 +1398,7 @@ public class OrderAdapter {
...
@@ -1398,6 +1398,7 @@ public class OrderAdapter {
}
}
if
(
OldOrderAccountType
.
MONTH_CARD_TOTAL_DISCOUNT
.
getCode
().
equals
(
accountBean
.
getType
()))
{
if
(
OldOrderAccountType
.
MONTH_CARD_TOTAL_DISCOUNT
.
getCode
().
equals
(
accountBean
.
getType
()))
{
responseVo
.
setMonthCardTotalDiscount
(
accountBean
.
getPrice
());
responseVo
.
setMonthCardTotalDiscount
(
accountBean
.
getPrice
());
responseVo
.
setMonthCardTotalDiscountName
(
accountBean
.
getName
());
}
}
if
(
OldOrderAccountType
.
FREIGHT_COUPON
.
getCode
().
equals
(
accountBean
.
getType
()))
{
if
(
OldOrderAccountType
.
FREIGHT_COUPON
.
getCode
().
equals
(
accountBean
.
getType
()))
{
responseVo
.
setFreightCouponName
(
accountBean
.
getName
());
responseVo
.
setFreightCouponName
(
accountBean
.
getName
());
...
...
order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
View file @
1fd51752
...
@@ -118,6 +118,10 @@ public class QueryOrderResponseVo {
...
@@ -118,6 +118,10 @@ public class QueryOrderResponseVo {
*/
*/
private
Long
monthCardTotalDiscount
;
private
Long
monthCardTotalDiscount
;
/**
/**
* 月享卡优惠总金额
*/
private
String
monthCardTotalDiscountName
;
/**
* 限时折扣优惠金额
* 限时折扣优惠金额
*/
*/
private
Long
discountLimitAmount
;
private
Long
discountLimitAmount
;
...
...
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