修改会员消费记录里面的时间显示与类型

component_utils/src/main/java/com/rv/component/utils/DateUtils.java

@@ -157,6 +157,16 @@ public class DateUtils {
         return sdf.format(new Date(time));
     }
 
+    /**
+     * 将时间戳转换成yyyy-MM-dd HH:mm:ss字符串
+     *
+     * @param time 时间戳
+     * @return yyyy-MM-dd HH:mm:ss
+     */
+    public static String timestampToString1(long time) {
+        return sdf7.format(new Date(time));
+    }
+
     /**
      * 获取手机当前时间戳毫秒
      *

module_mine/src/main/AndroidManifest.xml

@@ -5,7 +5,6 @@
     <application>
 
         <activity android:name="com.rv.version.activity.UpdateAppActivity" />
-
     </application>
 
 </manifest>
\ No newline at end of file

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

@@ -91,7 +91,7 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
 //        bodyMap.put("status", "3");
         bodyMap.put("hasMemberRight", 1);
         bodyMap.put("type", 1);
-        bodyMap.put("multiStatus", "4,5,6");
+        bodyMap.put("multiStatus", "3,4,5,6");
         mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, position, ApiConfig.HTTP_URL_ORDER_LIST, OrderListBean.class, bodyMap, headMap, mPage == 1 ? true : false);
     }
 

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

@@ -7,6 +7,7 @@ import android.widget.ImageView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
+import com.rv.component.utils.DateUtils;
 import com.rv.home.rv.module.ui.main.home.order.bean.OrderListBean;
 import com.rv.member.R;
 
@@ -33,6 +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() == 3) {
+                    helper.setText(R.id.tv_state, "待支付");
+                }
                 if (bean.getStatusX() == 4) {
                     helper.setText(R.id.tv_state, "待出行");
                 } else if (bean.getStatusX() == 5) {
@@ -53,8 +57,8 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
             OrderListBean.DataBeanX.DataBean.OrderRentVehicleDetail vehicleDetail = bean.getOrderRentVehicleDetail();
             if (vehicleDetail != null) {
                 helper.setText(R.id.tv_location, vehicleDetail.getStart_city_name() + "-" + vehicleDetail.getEnd_city_name());
-                helper.setText(R.id.tv_get_info, vehicleDetail.getStart_time() + " " + vehicleDetail.getStart_addr());
-                helper.setText(R.id.tv_return_info, vehicleDetail.getEnd_time() + " " + vehicleDetail.getEnd_addr());
+                helper.setText(R.id.tv_get_info, DateUtils.timestampToString1(vehicleDetail.getStart_time()) + " " + vehicleDetail.getStart_addr());
+                helper.setText(R.id.tv_return_info, DateUtils.timestampToString1(vehicleDetail.getEnd_time()) + " " + vehicleDetail.getEnd_addr());
                 if (vehicleDetail.getFreeDays() > 0) {
                     helper.setText(R.id.tv_member_right, "免费" + vehicleDetail.getFreeDays() + "天");
                 } else if (vehicleDetail.getRebate() > 0) {