Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -386,7 +386,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
                     tvVerified.setEnabled(true);
                 } else if (info.getCertificationStatus() == 1) {
                     tvVerified.setText("已实名认证");
-//                    tvVerified.setEnabled(false);
+                    tvVerified.setEnabled(false);
                 }
 
                 if (TextUtils.isEmpty(info.getPositionName())){

plugin_member/src/main/java/com/rv.member/bean/MemberListBean.java

@@ -3,6 +3,7 @@ package com.rv.member.bean;
 import com.google.gson.annotations.SerializedName;
 import com.ruiwenliu.wrapper.base.BaseBean;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 public class MemberListBean extends BaseBean {
@@ -34,7 +35,7 @@ public class MemberListBean extends BaseBean {
         private long endDate;
         private int discount;
         private int isdel;
-        private int price;
+        private BigDecimal price;
         private int number;
 
         public int getId() {
@@ -101,11 +102,11 @@ public class MemberListBean extends BaseBean {
             this.isdel = isdel;
         }
 
-        public int getPrice() {
+        public BigDecimal getPrice() {
             return price;
         }
 
-        public void setPrice(int price) {
+        public void setPrice(BigDecimal price) {
             this.price = price;
         }
 

plugin_member/src/main/java/com/rv.member/bean/MemberOrderBean.java

@@ -2,6 +2,8 @@ package com.rv.member.bean;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
 
+import java.math.BigDecimal;
+
 public class MemberOrderBean extends BaseBean {
 
     private MemberOrder data;
@@ -31,9 +33,9 @@ public class MemberOrderBean extends BaseBean {
         private int type;
         private long detailId;
         private int status;
-        private long goodsAmount;
-        private long orderAmount;
-        private long realAmount;
+        private BigDecimal goodsAmount;
+        private BigDecimal orderAmount;
+        private BigDecimal realAmount;
         private String picture;
         private String crtTime;
         private String crtUser;
@@ -91,27 +93,27 @@ public class MemberOrderBean extends BaseBean {
             this.status = status;
         }
 
-        public long getGoodsAmount() {
+        public BigDecimal getGoodsAmount() {
             return goodsAmount;
         }
 
-        public void setGoodsAmount(long goodsAmount) {
+        public void setGoodsAmount(BigDecimal goodsAmount) {
             this.goodsAmount = goodsAmount;
         }
 
-        public long getOrderAmount() {
+        public BigDecimal getOrderAmount() {
             return orderAmount;
         }
 
-        public void setOrderAmount(long orderAmount) {
+        public void setOrderAmount(BigDecimal orderAmount) {
             this.orderAmount = orderAmount;
         }
 
-        public long getRealAmount() {
+        public BigDecimal getRealAmount() {
             return realAmount;
         }
 
-        public void setRealAmount(long realAmount) {
+        public void setRealAmount(BigDecimal realAmount) {
             this.realAmount = realAmount;
         }