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
dc30542b
Commit
dc30542b
authored
Sep 23, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
混合支付添加svc卡返回值
parent
84a6b98d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
+6
-0
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
+1
-0
No files found.
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
View file @
dc30542b
...
@@ -15,6 +15,7 @@ package cn.freemud.entities.vo;
...
@@ -15,6 +15,7 @@ package cn.freemud.entities.vo;
import
lombok.Builder
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.util.List
;
import
java.util.List
;
@Data
@Data
...
@@ -124,4 +125,9 @@ public class ShoppingCartGoodsResponseVo extends ShoppingCartGoodsBaseResponseV
...
@@ -124,4 +125,9 @@ public class ShoppingCartGoodsResponseVo extends ShoppingCartGoodsBaseResponseV
* 配送费为零的原因:0:正常,1:超出配送范围
* 配送费为零的原因:0:正常,1:超出配送范围
*/
*/
private
Integer
deliveryFeeZeroReason
;
private
Integer
deliveryFeeZeroReason
;
/**
* svc卡支付金额
*/
private
BigDecimal
svcPayAmount
;
}
}
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
View file @
dc30542b
...
@@ -1438,6 +1438,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
...
@@ -1438,6 +1438,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
svcPayAmount
=
new
BigDecimal
(
orderAmount
-
deliveryAmount
).
divide
(
new
BigDecimal
(
100
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
svcPayAmount
=
new
BigDecimal
(
orderAmount
-
deliveryAmount
).
divide
(
new
BigDecimal
(
100
)).
setScale
(
2
,
BigDecimal
.
ROUND_HALF_UP
);
shoppingCartGoodsResponseVo
.
setTotalAmount
(
deliveryAmount
.
longValue
());
shoppingCartGoodsResponseVo
.
setTotalAmount
(
deliveryAmount
.
longValue
());
}
}
shoppingCartGoodsResponseVo
.
setSvcPayAmount
(
svcPayAmount
);
shoppingCartGoodsResponseVo
.
setSvcDiscountDesc
(
"储值卡支付¥"
+
svcPayAmount
);
shoppingCartGoodsResponseVo
.
setSvcDiscountDesc
(
"储值卡支付¥"
+
svcPayAmount
);
}
}
...
...
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