修改会员消费记录的折扣显示；修改订单评论的显示错误；

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/EvaluationActivity.java

@@ -115,9 +115,20 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
         if (dataBean != null) {
             tvName.setText(dataBean.getName());
             GlideManager.getInstance(mActivity).loadImage(dataBean.getIcon(), ivCar);
+            if (dataBean.getType() == 1) {
+                if (dataBean.getOrderRentVehicleDetail() != null && !TextUtils.isEmpty(dataBean.getOrderRentVehicleDetail().getCost_detail())) {
+                    tvContent.setText(dataBean.getOrderRentVehicleDetail().getCost_detail());
+                }
+            } else if (dataBean.getType() == 2) {
+                if (dataBean.getOrderTourDetail() != null && !TextUtils.isEmpty(dataBean.getOrderTourDetail().getCostDetail())) {
+                    tvContent.setText(dataBean.getOrderTourDetail().getCostDetail());
+                }
+            } else if (dataBean.getType() == 3) {
+                if (dataBean.getOrderMemberDetail() != null) {
+                    tvContent.setText("永久" + (dataBean.getOrderMemberDetail().getRebate() / 10) + "折租车, 免费用车" + dataBean.getOrderMemberDetail().getRentFreeNum() + "天");
+                }
+            }
         }
-
-
         intiEt();
         listImg = new ArrayList<>();
         mAdapter = new EvaluationAdapter();
@@ -147,7 +158,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
         starbar1.setOnStarChangeListener(new StarBar.OnStarChangeListener() {
             @Override
             public void onStarChange(float mark) {
-                mark1 = String.valueOf((int)(mark * 10));
+                mark1 = String.valueOf((int) (mark * 10));
                 setHint(mark, tvHint1);
             }
         });
@@ -156,7 +167,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
         starbar2.setOnStarChangeListener(new StarBar.OnStarChangeListener() {
             @Override
             public void onStarChange(float mark) {
-                mark2 = String.valueOf((int)(mark * 10));
+                mark2 = String.valueOf((int) (mark * 10));
                 setHint(mark, tvHint2);
             }
         });
@@ -165,7 +176,7 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
         starbar3.setOnStarChangeListener(new StarBar.OnStarChangeListener() {
             @Override
             public void onStarChange(float mark) {
-                mark3 = String.valueOf((int)(mark * 10));
+                mark3 = String.valueOf((int) (mark * 10));
                 setHint(mark, tvHint3);
             }
         });
@@ -259,19 +270,19 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
         scoreBean3.setVehicleScoreType("EXPERIENCE");
         scores.add(scoreBean3);
         String id = null;
-        if (1==dataBean.getType()){
+        if (1 == dataBean.getType()) {
             OrderListBean.DataBeanX.DataBean.OrderRentVehicleDetail orderRentVehicleDetail = dataBean.getOrderRentVehicleDetail();
-            if (orderRentVehicleDetail!=null){
+            if (orderRentVehicleDetail != null) {
                 id = String.valueOf(orderRentVehicleDetail.getId());
             }
-        }else if (2 == dataBean.getType()){
+        } else if (2 == dataBean.getType()) {
             OrderListBean.DataBeanX.DataBean.OrderTourDetail orderTourDetail = dataBean.getOrderTourDetail();
-            if (orderTourDetail!=null){
+            if (orderTourDetail != null) {
                 id = orderTourDetail.getId();
             }
         }
 
-        mPresenter.postBodyData(0, ApiConfig.HTTP_URL_SCORE, BaseBean.class, new Score(id,dataBean.getId(),scores), getHeadMap(), true);
+        mPresenter.postBodyData(0, ApiConfig.HTTP_URL_SCORE, BaseBean.class, new Score(id, dataBean.getId(), scores), getHeadMap(), true);
     }
 
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/bean/OrderListBean.java

@@ -397,7 +397,7 @@ public class OrderListBean extends BaseBean implements Serializable {
                 private int orderId;
                 private int endCity;
                 private int freeDays;
-                private int rebate;
+                private double rebate;
 
 
                 public int getFreeDays() {
@@ -408,11 +408,11 @@ public class OrderListBean extends BaseBean implements Serializable {
                     this.freeDays = freeDays;
                 }
 
-                public int getRebate() {
+                public double getRebate() {
                     return rebate;
                 }
 
-                public void setRebate(int rebate) {
+                public void setRebate(double rebate) {
                     this.rebate = rebate;
                 }
 

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

@@ -22,7 +22,6 @@ import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
-import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;

plugin_member/src/main/java/com/rv.member/adapter/ConsumeRecordListAdapter.java

@@ -34,9 +34,9 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
         if (bean != null) {
             if (!TextUtils.isEmpty(bean.getCrtTime())) {
                 helper.setText(R.id.tv_consume_time, "下单时间: " + bean.getCrtTime());
-                if(bean.getStatusX() == 2){
+                if (bean.getStatusX() == 2) {
                     helper.setText(R.id.tv_state, "已取消");
-                } else  if (bean.getStatusX() == 3) {
+                } else if (bean.getStatusX() == 3) {
                     helper.setText(R.id.tv_state, "待支付");
                 } else if (bean.getStatusX() == 4) {
                     helper.setText(R.id.tv_state, "待出行");
@@ -64,7 +64,9 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
                     helper.setText(R.id.tv_member_right, "免费" + vehicleDetail.getFreeDays() + "天");
                     helper.setVisible(R.id.tv_member_right, true);
                 } else if (vehicleDetail.getRebate() > 0) {
-                    helper.setText(R.id.tv_member_right, ((int) vehicleDetail.getRebate() / 10) + "折");
+                    double rebate = vehicleDetail.getRebate() / 10d;
+                    String s = String.valueOf(rebate);
+                    helper.setText(R.id.tv_member_right, replace(s) + "折");
                     helper.setVisible(R.id.tv_member_right, true);
                 }
             }
@@ -79,4 +81,13 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
             }
         });
     }
+
+
+    private String replace(String s) {
+        if (null != s && s.indexOf(".") > 0) {
+            s = s.replaceAll("0+?$", "");//去掉多余的0
+            s = s.replaceAll("[.]$", "");//如最后一位是.则去掉
+        }
+        return s;
+    }
 }