Merge branch 'master-price-john' of http://113.105.137.151:22280/lify/rvapp into master-video

module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -59,7 +59,7 @@ public class ApiConfig {
 
     public static String QUERY_HOT_GOODLIST = RvFrameConfig.HOST + "/api/app/home/app/unauth/goodList";   //推荐商品
 
-    public static String HTTP_URL_MEMBER_LIST = RvFrameConfig.ADMIN_POST + "/member/app/unauth/level/list";  // 会员等级列表
+    public static String HTTP_URL_MEMBER_LIST = RvFrameConfig.ADMIN_POST + "member/app/unauth/level/list";  // 会员等级列表
 
     public static String HTTP_URL_MEMBER_CREATE_ORDER = RvFrameConfig.HOST + "/api/order/orderMember/add"; // 创建订单
 

plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java

@@ -194,7 +194,16 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                 break;
             case 2:
                 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;
             case 3:
                 mPresenter.pay(MemberCenterActivity.this, api, (BeanTourOrderPay) result);
@@ -208,7 +217,6 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                     if (bean.getData() != null) {
                         couponBean = bean.getData().getCoupon();
                     }
-
                 }
 
                 showPayDialog();
@@ -358,7 +366,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                 super.helper(helper);
                 if (couponBean != null) {
                     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 {
                     isUseCoupon = false;
                     helper.setText(R.id.tv_amount, String.format("￥%1$s", selectCard.getPrice()));
@@ -398,7 +407,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                         public void onCheckedChanged(SwitchButton view, boolean isChecked) {
                             if (isChecked) {
                                 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 {
                                 isUseCoupon = false;
                                 helper.setText(R.id.tv_amount, String.format("￥%1$s", selectCard.getPrice()));

plugin_member/src/main/res/layout/view_member_privilege.xml

@@ -130,7 +130,7 @@
 
 
     <GridView
-        android:layout_marginTop="13dp"
+        android:layout_marginTop="20dp"
         android:id="@+id/gridview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"