Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
ShenghuoquanBusiness
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bp
ShenghuoquanBusiness
Commits
0b9a118e
Commit
0b9a118e
authored
Sep 10, 2021
by
shiyl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复已优惠金额大于合计的问题
parent
81176aa2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
ConfirmOrderViewModel.kt
...henghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt
+4
-2
No files found.
Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/viewmodel/ConfirmOrderViewModel.kt
View file @
0b9a118e
...
@@ -115,11 +115,15 @@ class ConfirmOrderViewModel : BaseViewModel() {
...
@@ -115,11 +115,15 @@ class ConfirmOrderViewModel : BaseViewModel() {
/**
/**
* 计算商品合计 = 原价 - 优惠
* 计算商品合计 = 原价 - 优惠
* 已优惠金额 = 优惠券金额(但不能大于合计)
*/
*/
private
fun
calculateTotalAmount
()
{
private
fun
calculateTotalAmount
()
{
var
total
=
originalAmount
-
couponAmount
var
total
=
originalAmount
-
couponAmount
if
(
total
<
0
)
{
if
(
total
<
0
)
{
total
=
0.00
total
=
0.00
couponAmountValue
.
value
=
originalAmount
}
else
{
couponAmountValue
.
value
=
couponAmount
}
}
totalAmount
.
value
=
total
totalAmount
.
value
=
total
}
}
...
@@ -166,8 +170,6 @@ class ConfirmOrderViewModel : BaseViewModel() {
...
@@ -166,8 +170,6 @@ class ConfirmOrderViewModel : BaseViewModel() {
}
}
}
}
selectedCouponList
.
value
=
list
selectedCouponList
.
value
=
list
// 更新优惠券总金额
couponAmountValue
.
value
=
couponAmount
// 更新选择优惠券名称
// 更新选择优惠券名称
couponNameValue
.
value
=
couponsAvailableList
.
value
?.
get
(
0
)
?.
name
couponNameValue
.
value
=
couponsAvailableList
.
value
?.
get
(
0
)
?.
name
// 重新计算相关金额
// 重新计算相关金额
...
...
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