Commit 23ab3ea7 authored by jianglx's avatar jianglx

修改会员购买时实付价格为0时的异常

parent ba355e6e
...@@ -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;
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); 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()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment