Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
RvApp
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
1
Merge Requests
1
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
lify
RvApp
Commits
23ab3ea7
Commit
23ab3ea7
authored
Nov 14, 2019
by
jianglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改会员购买时实付价格为0时的异常
parent
ba355e6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
MemberCenterActivity.java
...ber/src/main/java/com/rv.member/MemberCenterActivity.java
+14
-4
No files found.
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @
23ab3ea7
...
@@ -194,7 +194,16 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -194,7 +194,16 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
break
;
break
;
case
2
:
case
2
:
MemberOrderBean
orderBean
=
(
MemberOrderBean
)
result
;
MemberOrderBean
orderBean
=
(
MemberOrderBean
)
result
;
mPresenter
.
orderPay
(
orderBean
.
getData
().
getNo
(),
payType
,
1
);
if
(
orderBean
!=
null
&&
orderBean
.
getData
()
!=
null
)
{
if
(
orderBean
.
getData
().
getRealAmount
().
doubleValue
()
==
0
)
{
ARouter
.
getInstance
().
build
(
Constance
.
ACTIVITY_URL_ORDERLIST
)
.
withInt
(
"position"
,
3
)
.
navigation
();
finish
();
}
else
{
mPresenter
.
orderPay
(
orderBean
.
getData
().
getNo
(),
payType
,
1
);
}
}
break
;
break
;
case
3
:
case
3
:
mPresenter
.
pay
(
MemberCenterActivity
.
this
,
api
,
(
BeanTourOrderPay
)
result
);
mPresenter
.
pay
(
MemberCenterActivity
.
this
,
api
,
(
BeanTourOrderPay
)
result
);
...
@@ -208,7 +217,6 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -208,7 +217,6 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
if
(
bean
.
getData
()
!=
null
)
{
if
(
bean
.
getData
()
!=
null
)
{
couponBean
=
bean
.
getData
().
getCoupon
();
couponBean
=
bean
.
getData
().
getCoupon
();
}
}
}
}
showPayDialog
();
showPayDialog
();
...
@@ -358,7 +366,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -358,7 +366,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
super
.
helper
(
helper
);
super
.
helper
(
helper
);
if
(
couponBean
!=
null
)
{
if
(
couponBean
!=
null
)
{
isUseCoupon
=
true
;
isUseCoupon
=
true
;
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
Arith
.
sub
(
selectCard
.
getPrice
().
doubleValue
(),
couponBean
.
getUsedAmount
())));
double
realPrice
=
Arith
.
sub
(
selectCard
.
getPrice
().
doubleValue
(),
couponBean
.
getUsedAmount
());
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
realPrice
<
0
?
0
:
realPrice
));
}
else
{
}
else
{
isUseCoupon
=
false
;
isUseCoupon
=
false
;
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
selectCard
.
getPrice
()));
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
selectCard
.
getPrice
()));
...
@@ -398,7 +407,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
...
@@ -398,7 +407,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
public
void
onCheckedChanged
(
SwitchButton
view
,
boolean
isChecked
)
{
public
void
onCheckedChanged
(
SwitchButton
view
,
boolean
isChecked
)
{
if
(
isChecked
)
{
if
(
isChecked
)
{
isUseCoupon
=
true
;
isUseCoupon
=
true
;
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
Arith
.
sub
(
selectCard
.
getPrice
().
doubleValue
(),
couponBean
.
getUsedAmount
())));
double
realPrice
=
Arith
.
sub
(
selectCard
.
getPrice
().
doubleValue
(),
couponBean
.
getUsedAmount
());
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
realPrice
<
0
?
0
:
realPrice
));
}
else
{
}
else
{
isUseCoupon
=
false
;
isUseCoupon
=
false
;
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
selectCard
.
getPrice
()));
helper
.
setText
(
R
.
id
.
tv_amount
,
String
.
format
(
"¥%1$s"
,
selectCard
.
getPrice
()));
...
...
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