开发票功能列表

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

@@ -63,14 +63,14 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         menuPosition = intent.getIntExtra("position", 0);
         titleView.setTitle(mActivity.getString(R.string.rv_my_order));
-//        titleView.setText(R.id.tv_title_right, "开发票");
-//        titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
-//            @Override
-//            public void onClick(View v) {
-//                ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
-//                        .navigation();
-//            }
-//        });
+        titleView.setText(R.id.tv_title_right, "开发票");
+        titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
+                        .navigation();
+            }
+        });
         initRecyclerView();
         initViewpager();
 

module_mine/src/main/res/layout/rv_item_mine_collection_travel.xml

@@ -45,17 +45,18 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:textSize="@dimen/text_10"
+                    android:text="20人待出发"
                     android:textColor="@color/textGray"
-                    android:text="20人待出发" />
+                    android:textSize="@dimen/text_10"
+                    android:visibility="gone" />
 
                 <TextView
                     android:id="@+id/tv_tour_price"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:text="¥5000/人"
                     android:textColor="@color/colorBg"
-                    android:textSize="@dimen/text_14"
-                    android:text="¥5000/人" />
+                    android:textSize="@dimen/text_14" />
 
             </LinearLayout>
         </RelativeLayout>

plugin_invoice/src/main/java/com/xxrv/invoice/activity/BillingHistoryActivity.java

@@ -5,18 +5,27 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.View;
 import android.widget.ImageView;
 
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.xxrv.invoice.R;
 import com.xxrv.invoice.R2;
 import com.xxrv.invoice.adapter.InvoiceBillingHistoryAdapter;
+import com.xxrv.invoice.api.InvoiceApi;
+import com.xxrv.invoice.bean.BillingHistoryBean;
 import com.xxrv.invoice.presenter.InvoicePresenter;
+import com.yuyife.okgo.OkGoUtil;
 
-import java.sql.Array;
-import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -24,15 +33,20 @@ import butterknife.ButterKnife;
 /**
  * 开票历史
  */
-public class BillingHistoryActivity extends BaseStatusActivity<InvoicePresenter> {
+public class BillingHistoryActivity extends BaseStatusActivity<InvoicePresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
 
     @BindView(R2.id.rv_content)
     RecyclerView rvContent;
     @BindView(R2.id.iv_noorder_hint)
     ImageView ivNoorderHint;
+    @BindView(R2.id.refresh)
+    SimpleRefreshLayout mSimpleRefreshLayout;
 
     private InvoiceBillingHistoryAdapter adapter;
 
+    private int mPage;
+    private int countPage;
+
     public static Intent getIntent(Context context) {
         return new Intent(context, BillingHistoryActivity.class);
     }
@@ -48,21 +62,69 @@ public class BillingHistoryActivity extends BaseStatusActivity<InvoicePresenter>
 
         adapter = new InvoiceBillingHistoryAdapter();
         rvContent.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
+        adapter.setOnLoadMoreListener(this, rvContent);
+        mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(this));
+        mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
         rvContent.setAdapter(adapter);
+    }
 
-        setData();
+    @Override
+    protected void loadData(Bundle savedInstanceState, Intent intent) {
+        onRefresh();
     }
 
-    private void setData() {
-        ArrayList<String> list = new ArrayList<>();
-        for (int i = 0; i < 5; i++) {
-            list.add("33333");
-        }
-        adapter.addData(list);
+    private void getloadData(int page) {
+        Map<String, Object> headMap = new LinkedHashMap<>();
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, InvoiceApi.HTTP_URL_INVOICE_SELECTBYTYPE, BillingHistoryBean.class, headMap, true);
     }
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
+        switch (requestType) {
+            case 0:
+                setData((BillingHistoryBean) result);
+                break;
+        }
+    }
+
+    @Override
+    public void onShowError(String errorMsg, int errorType) {
+        super.onShowError(errorMsg, errorType);
+        mSimpleRefreshLayout.onRefreshComplete();
+    }
 
+    private void setData(BillingHistoryBean bean) {
+        if (mPage == 1) {
+            countPage = bean.getData().getTotalPage();
+            adapter.setNewData(bean.getData().getData());
+            mSimpleRefreshLayout.onRefreshComplete();
+            if (bean.getData().getTotalCount() == 0) {
+                ivNoorderHint.setVisibility(View.VISIBLE);
+                adapter.notifyDataSetChanged();
+            } else {
+                ivNoorderHint.setVisibility(View.GONE);
+            }
+        } else {
+            adapter.addData(bean.getData().getData());
+            adapter.loadMoreComplete();
+        }
+    }
+
+    @Override
+    public void onLoadMoreRequested() {
+        if (mPage >= countPage) {
+            adapter.loadMoreEnd();
+        } else {
+            mPage++;
+            getloadData(mPage);
+        }
+    }
+
+    @Override
+    public void onRefresh() {
+        mPage = 1;
+        getloadData(mPage);
     }
 }

plugin_invoice/src/main/java/com/xxrv/invoice/activity/InvoicingActivity.java

@@ -53,14 +53,16 @@ public class InvoicingActivity extends BaseStatusActivity<InvoicePresenter> {
         if (id == R.id.rl_item_announcement) {
             showAnnouncement();
         } else if (id == R.id.rl_item_car) {
-
-            startActivity(OrderInvoicingCarActivity.getIntent(mActivity));
+            //租房车
+            startActivity(OrderInvoicingCarActivity.getIntent(mActivity, 1));
         } else if (id == R.id.rl_item_tourism) {
-
+            //房车游
+            startActivity(OrderInvoicingCarActivity.getIntent(mActivity, 2));
         } else if (id == R.id.rl_item_member) {
-
+            //会员
+            startActivity(OrderInvoicingCarActivity.getIntent(mActivity, 3));
         } else if (id == R.id.rl_item_billing_history) {
-
+            //开票历史
             startActivity(BillingHistoryActivity.getIntent(mActivity));
         } else if (id == R.id.rl_item_invoicing_help) {
 

plugin_invoice/src/main/java/com/xxrv/invoice/activity/OrderInvoicingCarActivity.java

@@ -8,23 +8,30 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.url.Constance;
+import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
+import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
 import com.xxrv.invoice.R;
 import com.xxrv.invoice.R2;
 import com.xxrv.invoice.adapter.OrderInvoicingCarAdapter;
 import com.xxrv.invoice.api.InvoiceApi;
 import com.xxrv.invoice.bean.OrderInvoicingCarBean;
 import com.xxrv.invoice.presenter.InvoicePresenter;
+import com.yuyife.okgo.OkGoUtil;
 
-import java.util.ArrayList;
+import java.math.BigDecimal;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -33,7 +40,7 @@ import butterknife.OnClick;
 /**
  * 租车开发票订单列表
  */
-public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresenter> {
+public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
 
     @BindView(R2.id.rv_content)
     RecyclerView rvContent;
@@ -47,13 +54,26 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
     ImageView ivNoorderHint;
     @BindView(R2.id.tv_item_next)
     TextView tvItemNext;
+    @BindView(R2.id.refresh)
+    SimpleRefreshLayout mSimpleRefreshLayout;
+    @BindView(R2.id.ll_item_hint)
+    LinearLayout llItemHint;
+    @BindView(R2.id.ll_item_bottom)
+    LinearLayout llItemBottom;
+
 
     private OrderInvoicingCarAdapter mAdapter;
 
     private boolean isCheckAll = true;
 
-    public static Intent getIntent(Context context) {
-        return new Intent(context, OrderInvoicingCarActivity.class);
+    private int mPage;
+    private int countPage;
+
+    private int type;
+
+    public static Intent getIntent(Context context, int type) {
+        return new Intent(context, OrderInvoicingCarActivity.class)
+                .putExtra("type", type);
     }
 
     @Override
@@ -65,8 +85,13 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle("按订单开票");
 
+        type = intent.getIntExtra("type", 1);
+
         mAdapter = new OrderInvoicingCarAdapter();
         rvContent.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
+        mAdapter.setOnLoadMoreListener(this, rvContent);
+        mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(this));
+        mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
         rvContent.setAdapter(mAdapter);
 
 
@@ -86,14 +111,18 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
                 }
             }
         });
-
-
-        setData();
     }
 
     private void getCountSelectData() {
         List<OrderInvoicingCarBean.DataBeanX.DataBean> selectItem = mAdapter.getSelectItem();
         tvNumber.setText(String.valueOf(selectItem.size()));
+        double totalPrice = 0;
+        if (selectItem != null && selectItem.size() > 0) {
+            for (int i = 0; i < selectItem.size(); i++) {
+                totalPrice = totalPrice + selectItem.get(i).getRealAmount();
+            }
+        }
+        tvPrice.setText(String.valueOf(new BigDecimal(totalPrice).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
 
         if (selectItem.size() > 0) {
             tvItemNext.setBackgroundResource(R.drawable.shape_rv_bg_shallow_dark_yellow_circle);
@@ -114,24 +143,21 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
         }
     }
 
-    private void setData() {
-        ArrayList<OrderInvoicingCarBean.DataBeanX.DataBean> objects = new ArrayList<>();
-        for (int i = 0; i < 5; i++) {
-            objects.add(new OrderInvoicingCarBean.DataBeanX.DataBean());
-        }
-        mAdapter.addData(objects);
-    }
 
     @Override
     public void onShowResult(int requestType, BaseBean result) {
-
+        mSimpleRefreshLayout.onRefreshComplete();
+        switch (requestType) {
+            case 0:
+                processData((OrderInvoicingCarBean) result);
+                break;
+        }
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
-        ButterKnife.bind(this);
+    public void onShowError(String errorMsg, int errorType) {
+        super.onShowError(errorMsg, errorType);
+        mSimpleRefreshLayout.onRefreshComplete();
     }
 
     @OnClick({R2.id.tv_item_hint, R2.id.cb_all, R2.id.tv_item_next})
@@ -159,4 +185,87 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
             startActivity(OrderInvoicingCarDetailsActivity.getIntent(mActivity));
         }
     }
+
+
+    @Override
+    protected void loadData(Bundle savedInstanceState, Intent intent) {
+        onRefresh();
+    }
+
+    @Override
+    public void onRefresh() {
+        mPage = 1;
+        orderData(mPage);
+//        tvItemNext.setBackgroundResource(R.drawable.shape_rv_bg_shallow_dark_yellow_circle2);
+//        tvItemNext.setEnabled(false);
+//        tvNumber.setText("0");
+//        tvPrice.setText("0.0");
+    }
+
+
+    private void orderData(int page) {
+        Map<String, Object> headMap = new LinkedHashMap<>();
+        if (OkGoUtil.getToken() != null)
+            headMap.put("Authorization", OkGoUtil.getToken());
+        Map<String, Object> mapData = new LinkedHashMap<>();
+        mapData.put("page", page);
+        mapData.put("limit", 10);
+        mapData.put("multiStatus", "6,-1");
+        mapData.put("type", type);  //"订单类型 1--租车；2--旅游; 3--会员订单")
+        mapData.put("invoiceStatus", "0");  //"开票状态，0未开票，1已开票
+        mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, InvoiceApi.HTTP_URL_ORDER_LIST, OrderInvoicingCarBean.class, mapData, headMap, page == 1 ? true : false);
+    }
+
+
+    /**
+     * 处理请求数据
+     *
+     * @param bean
+     */
+    private void processData(OrderInvoicingCarBean bean) {
+        if (mPage == 1) {
+            countPage = bean.getData().getTotalPage();
+            mAdapter.setNewData(bean.getData().getData());
+            mSimpleRefreshLayout.onRefreshComplete();
+            if (bean.getData().getTotalCount() == 0) {
+                llItemHint.setVisibility(View.GONE);
+                llItemBottom.setVisibility(View.GONE);
+                ivNoorderHint.setVisibility(View.VISIBLE);
+                mAdapter.notifyDataSetChanged();
+            } else {
+                llItemHint.setVisibility(View.VISIBLE);
+                llItemBottom.setVisibility(View.VISIBLE);
+                ivNoorderHint.setVisibility(View.GONE);
+            }
+        } else {
+            mAdapter.addData(bean.getData().getData());
+            mAdapter.loadMoreComplete();
+        }
+        getCountSelectData();
+        if (mAdapter.getData().size() != mAdapter.getSelectItem().size()) {
+            cbAll.setChecked(false);
+            isCheckAll = true;
+        } else {
+            cbAll.setChecked(true);
+            isCheckAll = false;
+        }
+    }
+
+    @Override
+    public void onLoadMoreRequested() {
+        if (mPage >= countPage) {
+            mAdapter.loadMoreEnd();
+
+        } else {
+            mPage++;
+            orderData(mPage);
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        // TODO: add setContentView(...) invocation
+        ButterKnife.bind(this);
+    }
 }

plugin_invoice/src/main/java/com/xxrv/invoice/adapter/InvoiceBillingHistoryAdapter.java

@@ -2,20 +2,33 @@ package com.xxrv.invoice.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.rv.component.utils.DateUtils;
 import com.xxrv.invoice.R;
+import com.xxrv.invoice.bean.BillingHistoryBean;
 
 /**
  * 开票历史 item
  */
 
-public class InvoiceBillingHistoryAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
+public class InvoiceBillingHistoryAdapter extends BaseQuickAdapter<BillingHistoryBean.DataBeanX.DataBean, BaseViewHolder> {
 
     public InvoiceBillingHistoryAdapter() {
         super(R.layout.rv_item_invoice_billing_history);
     }
 
     @Override
-    protected void convert(BaseViewHolder helper, String item) {
+    protected void convert(BaseViewHolder helper, BillingHistoryBean.DataBeanX.DataBean item) {
+        helper.setText(R.id.tv_date, DateUtils.timestampToString1(item.getCrtTime()));
 
+        helper.setText(R.id.tv_type, item.getTitleName());
+        helper.setText(R.id.tv_price, String.valueOf(item.getAmount()));
+
+        if ("1".equals(item.getType())) {   //"订单类型 1--租车；2--旅游; 3--会员订单")
+            helper.setText(R.id.tv_title, "租房车");
+        } else if ("2".equals(item.getType())) {
+            helper.setText(R.id.tv_title, "房车游");
+        } else if ("3".equals(item.getType())) {
+            helper.setText(R.id.tv_title, "会员");
+        }
     }
 }

plugin_invoice/src/main/java/com/xxrv/invoice/adapter/OrderInvoicingCarAdapter.java

@@ -2,6 +2,7 @@ package com.xxrv.invoice.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.rv.component.utils.DateUtils;
 import com.xxrv.invoice.R;
 import com.xxrv.invoice.bean.OrderInvoicingCarBean;
 
@@ -26,10 +27,33 @@ public class OrderInvoicingCarAdapter extends BaseQuickAdapter<OrderInvoicingCar
             helper.setChecked(R.id.cb_select, false);
         }
 
+        helper.setText(R.id.tv_name, item.getName());
+
+        OrderInvoicingCarBean.DataBeanX.DataBean.OrderRentVehicleDetail orderRentVehicleDetail = item.getOrderRentVehicleDetail();
+        OrderInvoicingCarBean.DataBeanX.DataBean.OrderTourDetail orderTourDetail = item.getOrderTourDetail();
+        OrderInvoicingCarBean.DataBeanX.DataBean.OrderMemberDetail orderMemberDetail = item.getOrderMemberDetail();
+        if (orderRentVehicleDetail != null) {
+            helper.setText(R.id.tv_type, "租房车");
+            helper.setText(R.id.tv_get_date, "取：" + DateUtils.timestampToString1(orderRentVehicleDetail.getStart_time()) + orderRentVehicleDetail.getStart_addr());
+            helper.setText(R.id.tv_out_date, "还：" + DateUtils.timestampToString1(orderRentVehicleDetail.getEnd_time()) + orderRentVehicleDetail.getEnd_addr());
+            helper.setText(R.id.tv_price, String.format("¥%1$s", item.getRealAmount()));
+        } else if (orderTourDetail != null) {
+            helper.setText(R.id.tv_type, "房车游");
+            helper.setText(R.id.tv_get_date, "出发时间：" + DateUtils.timestampToString1(orderTourDetail.getStartTime()));
+            helper.setText(R.id.tv_out_date, "人数：" + orderTourDetail.getTotalNumber() + "人");
+            helper.setText(R.id.tv_price, String.format("¥%1$s", item.getRealAmount()));
+        } else if (orderMemberDetail != null) {
+            helper.setText(R.id.tv_type, "会员");
+            helper.setText(R.id.tv_get_date, orderMemberDetail.getContent());
+            helper.setText(R.id.tv_out_date, item.getCrtTime());
+            helper.setText(R.id.tv_price, String.format("¥%1$s", item.getRealAmount()));
+        }
+
         helper.addOnClickListener(R.id.ll_item_bg);
         helper.addOnClickListener(R.id.cb_select);
     }
 
+
     public int getPosition(OrderInvoicingCarBean.DataBeanX.DataBean item) {
         return mData.indexOf(item);
     }

plugin_invoice/src/main/java/com/xxrv/invoice/api/InvoiceApi.java

@@ -5,4 +5,8 @@ import com.frame.rv.config.RvFrameConfig;
 
 public class InvoiceApi {
     public static String HTTP_URL_CAR_TYPE_NOTICE = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/notice.html";//预定须知
+
+    public static String HTTP_URL_ORDER_LIST = RvFrameConfig.VEHICLE_ORDER + "baseOrder/page";//订单列表
+
+    public static String HTTP_URL_INVOICE_SELECTBYTYPE = RvFrameConfig.HOST + "/api/order/order/invoice/selectByType";//开票记录
 }

plugin_invoice/src/main/java/com/xxrv/invoice/bean/BillingHistoryBean.java

+package com.xxrv.invoice.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 开票记录
+ */
+
+public class BillingHistoryBean extends BaseBean {
+
+    private DataBeanX data;
+    private int code;
+
+    public DataBeanX getData() {
+        return data;
+    }
+
+    public void setData(DataBeanX data) {
+        this.data = data;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public static class DataBeanX {
+
+        private int totalCount;
+        private int totalPage;
+        private int pageNum;
+        private List<DataBean> data;
+
+        public int getTotalCount() {
+            return totalCount;
+        }
+
+        public void setTotalCount(int totalCount) {
+            this.totalCount = totalCount;
+        }
+
+        public int getTotalPage() {
+            return totalPage;
+        }
+
+        public void setTotalPage(int totalPage) {
+            this.totalPage = totalPage;
+        }
+
+        public int getPageNum() {
+            return pageNum;
+        }
+
+        public void setPageNum(int pageNum) {
+            this.pageNum = pageNum;
+        }
+
+        public List<DataBean> getData() {
+            return data;
+        }
+
+        public void setData(List<DataBean> data) {
+            this.data = data;
+        }
+
+        public static class DataBean implements Serializable {
+
+            private String id;
+            private String type;
+            private String orderIds;
+            private String titleType;
+            private String titleName;
+            private String taxCode;
+            private String contentRemark;
+            private String contentContact;
+            private String contentAccount;
+            private String drawer;
+            private double amount;
+            private String receiveType;
+            private String receiveContent;
+            private long crtTime;
+            private long updTime;
+            private String userId;
+
+            public String getId() {
+                return id;
+            }
+
+            public void setId(String id) {
+                this.id = id;
+            }
+
+            public String getType() {
+                return type;
+            }
+
+            public void setType(String type) {
+                this.type = type;
+            }
+
+            public String getOrderIds() {
+                return orderIds;
+            }
+
+            public void setOrderIds(String orderIds) {
+                this.orderIds = orderIds;
+            }
+
+            public String getTitleType() {
+                return titleType;
+            }
+
+            public void setTitleType(String titleType) {
+                this.titleType = titleType;
+            }
+
+            public String getTitleName() {
+                return titleName;
+            }
+
+            public void setTitleName(String titleName) {
+                this.titleName = titleName;
+            }
+
+            public String getTaxCode() {
+                return taxCode;
+            }
+
+            public void setTaxCode(String taxCode) {
+                this.taxCode = taxCode;
+            }
+
+            public String getContentRemark() {
+                return contentRemark;
+            }
+
+            public void setContentRemark(String contentRemark) {
+                this.contentRemark = contentRemark;
+            }
+
+            public String getContentContact() {
+                return contentContact;
+            }
+
+            public void setContentContact(String contentContact) {
+                this.contentContact = contentContact;
+            }
+
+            public String getContentAccount() {
+                return contentAccount;
+            }
+
+            public void setContentAccount(String contentAccount) {
+                this.contentAccount = contentAccount;
+            }
+
+            public String getDrawer() {
+                return drawer;
+            }
+
+            public void setDrawer(String drawer) {
+                this.drawer = drawer;
+            }
+
+            public double getAmount() {
+                return amount;
+            }
+
+            public void setAmount(double amount) {
+                this.amount = amount;
+            }
+
+            public String getReceiveType() {
+                return receiveType;
+            }
+
+            public void setReceiveType(String receiveType) {
+                this.receiveType = receiveType;
+            }
+
+            public String getReceiveContent() {
+                return receiveContent;
+            }
+
+            public void setReceiveContent(String receiveContent) {
+                this.receiveContent = receiveContent;
+            }
+
+            public long getCrtTime() {
+                return crtTime;
+            }
+
+            public void setCrtTime(long crtTime) {
+                this.crtTime = crtTime;
+            }
+
+            public long getUpdTime() {
+                return updTime;
+            }
+
+            public void setUpdTime(long updTime) {
+                this.updTime = updTime;
+            }
+
+            public String getUserId() {
+                return userId;
+            }
+
+            public void setUserId(String userId) {
+                this.userId = userId;
+            }
+        }
+    }
+}

plugin_invoice/src/main/java/com/xxrv/invoice/bean/OrderInvoicingCarBean.java

 package com.xxrv.invoice.bean;
 
+import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.google.gson.annotations.SerializedName;
 import com.ruiwenliu.wrapper.base.BaseBean;
 
 import java.io.Serializable;
@@ -9,7 +11,7 @@ import java.util.List;
  * 订单租车
  */
 
-public class OrderInvoicingCarBean extends BaseBean{
+public class OrderInvoicingCarBean extends BaseBean {
 
     private DataBeanX data;
     private int code;
@@ -69,8 +71,8 @@ public class OrderInvoicingCarBean extends BaseBean{
             this.data = data;
         }
 
-        public static class DataBean implements Serializable{
-            public  int selectType;//是否选中
+        public static class DataBean implements Serializable {
+            public int selectType;//是否选中
 
             public int getSelectType() {
                 return selectType;
@@ -79,6 +81,823 @@ public class OrderInvoicingCarBean extends BaseBean{
             public void setSelectType(int selectType) {
                 this.selectType = selectType;
             }
+
+
+            /**
+             * no : 4a0c200a-c4f0-4c37-8cdc-d2ee5cc08c20
+             * type : 1  订单类型 1–租车；2–旅游 3-会员
+             * status : 3
+             * goodsAmount : 71200.02
+             * orderAmount : 91200.02
+             * userId : 14
+             * picture : https://xxfcim.upyuns.com/image/u/2/10000002/201905/o/adb766b69c0140018a3aaaa08b37d41d.jpg
+             * crtTime : 2019-05-30 15:45:29
+             * crtUser : 14
+             * crtName : 18655555559
+             * crtHost : 192.168.56.1
+             * updTime : 2019-05-30 15:45:29
+             * updUser : 14
+             * updName : 18655555559
+             * updHost : 192.168.56.1
+             * detail : {"start_city_name":"东莞市","end_addr":"廊坊分公司","driver_type":1,"end_time":1559318400000,"day_num":2,"end_company_id":0,"cost_detail":"{\"key\":\"费用明细\",\"val\":\"\",\"children\":[{\"key\":\"车辆租赁费\",\"val\":\"￥70000.02\",\"children\":[{\"key\":\"大通自行式C型房车（旅居版）车型1\",\"val\":\"￥35000.01/天\"},{\"key\":\"租用天数\",\"val\":\"2天\"},{\"key\":\"房车数量\",\"val\":\"1辆\"}]},{\"key\":\"服务费（司机）\",\"val\":\"￥1200.00\",\"children\":[{\"key\":\"欣新司机\",\"val\":\"￥600.00/天\"},{\"key\":\"司机数量\",\"val\":\"{driverNum}个\"},{\"key\":\"房车数量\",\"val\":\"2天\"}]},{\"key\":\"用车押金\",\"val\":\"￥20000.00\"}]}","model_id":2,"end_city_name":"东莞市","s_userid":0,"start_time":1559145600000,"start_company_id":2,"score":0,"s_time":0,"deposit":20000,"crt_time":1559202328592,"upd_time":1559202328592,"id":35,"start_city":441900,"start_addr":"廊坊分公司","order_id":46,"end_city":0}
+             * detailId : 37
+             */
+
+            private String no;
+            private int id;
+            private int type;
+            @SerializedName("status")
+            private int statusX;
+            private double goodsAmount;
+            private double orderAmount;
+            private double realAmount;
+            private int userId;
+            private String picture;
+            private String crtTime;
+            private String crtUser;
+            private String crtName;
+            private String crtHost;
+            private String updTime;
+            private String updUser;
+            private String updName;
+            private String updHost;
+            private String qrcodeStr;
+            private OrderRentVehicleDetail orderRentVehicleDetail;
+            private OrderTourDetail orderTourDetail;
+            private OrderMemberDetail orderMemberDetail;
+            private int detailId;
+            private String name;
+            private String coverPic;
+
+            public String getCoverPic() {
+                return coverPic;
+            }
+
+            public void setCoverPic(String coverPic) {
+                this.coverPic = coverPic;
+            }
+
+            public String getQrcodeStr() {
+                return qrcodeStr;
+            }
+
+            public void setQrcodeStr(String qrcodeStr) {
+                this.qrcodeStr = qrcodeStr;
+            }
+
+            public double getRealAmount() {
+                return realAmount;
+            }
+
+            public void setRealAmount(double realAmount) {
+                this.realAmount = realAmount;
+            }
+
+            public int getId() {
+                return id;
+            }
+
+            public void setId(int id) {
+                this.id = id;
+            }
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+
+            public String getNo() {
+                return no;
+            }
+
+            public void setNo(String no) {
+                this.no = no;
+            }
+
+            public int getType() {
+                return type;
+            }
+
+            public void setType(int type) {
+                this.type = type;
+            }
+
+            public int getStatusX() {
+                return statusX;
+            }
+
+            public void setStatusX(int statusX) {
+                this.statusX = statusX;
+            }
+
+            public double getGoodsAmount() {
+                return goodsAmount;
+            }
+
+            public void setGoodsAmount(double goodsAmount) {
+                this.goodsAmount = goodsAmount;
+            }
+
+            public double getOrderAmount() {
+                return orderAmount;
+            }
+
+            public void setOrderAmount(double orderAmount) {
+                this.orderAmount = orderAmount;
+            }
+
+            public int getUserId() {
+                return userId;
+            }
+
+            public void setUserId(int userId) {
+                this.userId = userId;
+            }
+
+            public String getPicture() {
+                return picture;
+            }
+
+            public String getIcon() {
+                String icon = "";
+                if (!TextUtil.isEmpty(picture)) {
+                    String[] icons = picture.split(",");
+                    if (icons != null && icons.length > 0) {
+                        icon = icons[0];
+                    } else {
+                        icon = picture;
+                    }
+                }
+
+                return icon;
+            }
+
+            public void setPicture(String picture) {
+                this.picture = picture;
+            }
+
+            public String getCrtTime() {
+                return crtTime;
+            }
+
+            public void setCrtTime(String crtTime) {
+                this.crtTime = crtTime;
+            }
+
+            public String getCrtUser() {
+                return crtUser;
+            }
+
+            public void setCrtUser(String crtUser) {
+                this.crtUser = crtUser;
+            }
+
+            public String getCrtName() {
+                return crtName;
+            }
+
+            public void setCrtName(String crtName) {
+                this.crtName = crtName;
+            }
+
+            public String getCrtHost() {
+                return crtHost;
+            }
+
+            public void setCrtHost(String crtHost) {
+                this.crtHost = crtHost;
+            }
+
+            public String getUpdTime() {
+                return updTime;
+            }
+
+            public void setUpdTime(String updTime) {
+                this.updTime = updTime;
+            }
+
+            public String getUpdUser() {
+                return updUser;
+            }
+
+            public void setUpdUser(String updUser) {
+                this.updUser = updUser;
+            }
+
+            public String getUpdName() {
+                return updName;
+            }
+
+            public void setUpdName(String updName) {
+                this.updName = updName;
+            }
+
+            public String getUpdHost() {
+                return updHost;
+            }
+
+            public void setUpdHost(String updHost) {
+                this.updHost = updHost;
+            }
+
+            public OrderRentVehicleDetail getOrderRentVehicleDetail() {
+                return orderRentVehicleDetail;
+            }
+
+            public void setOrderRentVehicleDetail(OrderRentVehicleDetail detail) {
+                this.orderRentVehicleDetail = orderRentVehicleDetail;
+            }
+
+            public OrderTourDetail getOrderTourDetail() {
+                return orderTourDetail;
+            }
+
+            public void setOrderTourDetail(OrderTourDetail orderTourDetail) {
+                this.orderTourDetail = orderTourDetail;
+            }
+
+            public int getDetailId() {
+                return detailId;
+            }
+
+            public void setDetailId(int detailId) {
+                this.detailId = detailId;
+            }
+
+            public OrderMemberDetail getOrderMemberDetail() {
+                return orderMemberDetail;
+            }
+
+            public void setOrderMemberDetail(OrderMemberDetail orderMemberDetail) {
+                this.orderMemberDetail = orderMemberDetail;
+            }
+
+
+            public static class OrderRentVehicleDetail implements Serializable {
+                /**
+                 * start_city_name : 东莞市
+                 * end_addr : 廊坊分公司
+                 * driver_type : 1
+                 * end_time : 1559318400000
+                 * day_num : 2
+                 * end_company_id : 0
+                 * cost_detail : {"key":"费用明细","val":"","children":[{"key":"车辆租赁费","val":"￥70000.02","children":[{"key":"大通自行式C型房车（旅居版）车型1","val":"￥35000.01/天"},{"key":"租用天数","val":"2天"},{"key":"房车数量","val":"1辆"}]},{"key":"服务费（司机）","val":"￥1200.00","children":[{"key":"欣新司机","val":"￥600.00/天"},{"key":"司机数量","val":"{driverNum}个"},{"key":"房车数量","val":"2天"}]},{"key":"用车押金","val":"￥20000.00"}]}
+                 * model_id : 2
+                 * end_city_name : 东莞市
+                 * s_userid : 0
+                 * start_time : 1559145600000
+                 * start_company_id : 2
+                 * score : 0
+                 * s_time : 0
+                 * deposit : 20000.0
+                 * crt_time : 1559202328592
+                 * upd_time : 1559202328592
+                 * id : 35
+                 * start_city : 441900
+                 * start_addr : 廊坊分公司
+                 * order_id : 46
+                 * end_city : 0
+                 */
+
+                private String startCityName;
+                private String endAddr;
+                private int driverType;
+                private long endTime;
+                private int dayNum;
+                private int endCompanyId;
+                private String costDetail;
+                private int modelId;
+                private String endCityName;
+                private int sUserid;
+                private long startTime;
+                private int startCompanyId;
+                private int score;
+                private int sTime;
+                private double deposit;
+                private long crtTime;
+                private long updTime;
+                private int id;
+                private int startCity;
+                private String startAddr;
+                private int orderId;
+                private int endCity;
+                private int freeDays;
+                private double rebate;
+                private long delayAddEndTime;
+
+                public int getFreeDays() {
+                    return freeDays;
+                }
+
+                public void setFreeDays(int freeDays) {
+                    this.freeDays = freeDays;
+                }
+
+                public double getRebate() {
+                    return rebate;
+                }
+
+                public void setRebate(double rebate) {
+                    this.rebate = rebate;
+                }
+
+                public String getStart_city_name() {
+                    return startCityName;
+                }
+
+                public void setStart_city_name(String start_city_name) {
+                    this.startCityName = start_city_name;
+                }
+
+                public String getEnd_addr() {
+                    return endAddr;
+                }
+
+                public void setEnd_addr(String end_addr) {
+                    this.endAddr = end_addr;
+                }
+
+                public int getDriver_type() {
+                    return driverType;
+                }
+
+                public void setDriver_type(int driver_type) {
+                    this.driverType = driver_type;
+                }
+
+                public long getEnd_time() {
+                    return endTime;
+                }
+
+                public void setEnd_time(long end_time) {
+                    this.endTime = end_time;
+                }
+
+                public int getDay_num() {
+                    return dayNum;
+                }
+
+                public void setDay_num(int day_num) {
+                    this.dayNum = day_num;
+                }
+
+                public int getEnd_company_id() {
+                    return endCompanyId;
+                }
+
+                public void setEnd_company_id(int end_company_id) {
+                    this.endCompanyId = end_company_id;
+                }
+
+                public String getCost_detail() {
+                    return costDetail;
+                }
+
+                public void setCost_detail(String cost_detail) {
+                    this.costDetail = cost_detail;
+                }
+
+                public int getModel_id() {
+                    return modelId;
+                }
+
+                public void setModel_id(int model_id) {
+                    this.modelId = model_id;
+                }
+
+                public String getEnd_city_name() {
+                    return endCityName;
+                }
+
+                public void setEnd_city_name(String end_city_name) {
+                    this.endCityName = end_city_name;
+                }
+
+                public int getS_userid() {
+                    return sUserid;
+                }
+
+                public void setS_userid(int s_userid) {
+                    this.sUserid = s_userid;
+                }
+
+                public long getStart_time() {
+                    return startTime;
+                }
+
+                public void setStart_time(long start_time) {
+                    this.startTime = start_time;
+                }
+
+                public int getStart_company_id() {
+                    return startCompanyId;
+                }
+
+                public void setStart_company_id(int start_company_id) {
+                    this.startCompanyId = start_company_id;
+                }
+
+                public int getScore() {
+                    return score;
+                }
+
+                public void setScore(int score) {
+                    this.score = score;
+                }
+
+                public int getS_time() {
+                    return sTime;
+                }
+
+                public void setS_time(int s_time) {
+                    this.sTime = s_time;
+                }
+
+                public double getDeposit() {
+                    return deposit;
+                }
+
+                public void setDeposit(double deposit) {
+                    this.deposit = deposit;
+                }
+
+                public long getCrt_time() {
+                    return crtTime;
+                }
+
+                public void setCrt_time(long crt_time) {
+                    this.crtTime = crt_time;
+                }
+
+                public long getUpd_time() {
+                    return updTime;
+                }
+
+                public void setUpd_time(long upd_time) {
+                    this.updTime = upd_time;
+                }
+
+                public int getId() {
+                    return id;
+                }
+
+                public void setId(int id) {
+                    this.id = id;
+                }
+
+                public int getStart_city() {
+                    return startCity;
+                }
+
+                public void setStart_city(int start_city) {
+                    this.startCity = start_city;
+                }
+
+                public String getStart_addr() {
+                    return startAddr;
+                }
+
+                public void setStart_addr(String start_addr) {
+                    this.startAddr = start_addr;
+                }
+
+                public int getOrder_id() {
+                    return orderId;
+                }
+
+                public void setOrder_id(int order_id) {
+                    this.orderId = order_id;
+                }
+
+                public int getEnd_city() {
+                    return endCity;
+                }
+
+                public void setEnd_city(int end_city) {
+                    this.endCity = end_city;
+                }
+
+
+                public long getDelayAddEndTime() {
+                    return delayAddEndTime;
+                }
+
+                public void setDelayAddEndTime(long delayAddEndTime) {
+                    this.delayAddEndTime = delayAddEndTime;
+                }
+            }
+
+            public static class OrderTourDetail implements Serializable {
+                /**
+                 * contactEmail	string
+                 * 联系邮箱
+                 * <p>
+                 * contactMan	string
+                 * 联系人
+                 * <p>
+                 * contactPhone	string
+                 * 联系电话
+                 * <p>
+                 * costDetail	string
+                 * 费用明细
+                 * <p>
+                 * dayNum	integer($int32)
+                 * 天数
+                 * <p>
+                 * endAddr	string
+                 * 还车地点
+                 * <p>
+                 * endTime	integer($int64)
+                 * 结束时间
+                 * <p>
+                 * goodId	integer($int32)
+                 * 商品id
+                 * <p>
+                 * id	integer($int32)
+                 * 主键
+                 * <p>
+                 * name	string
+                 * 名称
+                 * <p>
+                 * orderId	integer($int32)
+                 * 基础订单id
+                 * <p>
+                 * speIds	string
+                 * 规格ids
+                 * <p>
+                 * spePriceId	integer($int32)
+                 * 具体商品（商品项）id
+                 * <p>
+                 * startAddr	string
+                 * 出发地点
+                 * <p>
+                 * startCompanyId	integer($int32)
+                 * 出发公司Id
+                 * <p>
+                 * startTime	integer($int64)
+                 * 开始时间
+                 * <p>
+                 * tourUserIds	string
+                 * 出游乘客ids
+                 */
+
+                private String id;
+                private String orderId;
+                private String crtTime;//": 1560163254063,
+                private String updTime;//": 1560163254063,
+                private long startTime;//": 1560152144000,
+                private long endTime;//": 1560324944000,
+                private String startAddr;//": "东土",
+                private String endAddr;//": "西天3",
+                private String tourUserIds;//": "4,5",
+                private String startCompanyId;//": 2,
+                private String costDetail;
+                private String goodId;//": 37,
+                private String speIds;//": "string",
+                private String spePriceId;//": 109,
+                private String contactMan;//": "周2",
+                private String contactPhone;//": "13712398220",
+                private String contactEmail;//":
+                private int startCity;
+                private String startCityName;
+                private int totalNumber;
+
+
+                public String getId() {
+                    return id;
+                }
+
+                public void setId(String id) {
+                    this.id = id;
+                }
+
+                public String getOrderId() {
+                    return orderId;
+                }
+
+                public void setOrderId(String orderId) {
+                    this.orderId = orderId;
+                }
+
+                public String getCrtTime() {
+                    return crtTime;
+                }
+
+                public void setCrtTime(String crtTime) {
+                    this.crtTime = crtTime;
+                }
+
+                public String getUpdTime() {
+                    return updTime;
+                }
+
+                public void setUpdTime(String updTime) {
+                    this.updTime = updTime;
+                }
+
+                public long getStartTime() {
+                    return startTime;
+                }
+
+                public void setStartTime(long startTime) {
+                    this.startTime = startTime;
+                }
+
+                public long getEndTime() {
+                    return endTime;
+                }
+
+                public void setEndTime(long endTime) {
+                    this.endTime = endTime;
+                }
+
+                public String getStartAddr() {
+                    return startAddr;
+                }
+
+                public void setStartAddr(String startAddr) {
+                    this.startAddr = startAddr;
+                }
+
+                public String getEndAddr() {
+                    return endAddr;
+                }
+
+                public void setEndAddr(String endAddr) {
+                    this.endAddr = endAddr;
+                }
+
+                public String getTourUserIds() {
+                    return tourUserIds;
+                }
+
+                public void setTourUserIds(String tourUserIds) {
+                    this.tourUserIds = tourUserIds;
+                }
+
+                public String getStartCompanyId() {
+                    return startCompanyId;
+                }
+
+                public void setStartCompanyId(String startCompanyId) {
+                    this.startCompanyId = startCompanyId;
+                }
+
+                public String getCostDetail() {
+                    return costDetail;
+                }
+
+                public void setCostDetail(String costDetail) {
+                    this.costDetail = costDetail;
+                }
+
+                public String getGoodId() {
+                    return goodId;
+                }
+
+                public void setGoodId(String goodId) {
+                    this.goodId = goodId;
+                }
+
+                public String getSpeIds() {
+                    return speIds;
+                }
+
+                public void setSpeIds(String speIds) {
+                    this.speIds = speIds;
+                }
+
+                public String getSpePriceId() {
+                    return spePriceId;
+                }
+
+                public void setSpePriceId(String spePriceId) {
+                    this.spePriceId = spePriceId;
+                }
+
+                public String getContactMan() {
+                    return contactMan;
+                }
+
+                public void setContactMan(String contactMan) {
+                    this.contactMan = contactMan;
+                }
+
+                public String getContactPhone() {
+                    return contactPhone;
+                }
+
+                public void setContactPhone(String contactPhone) {
+                    this.contactPhone = contactPhone;
+                }
+
+                public String getContactEmail() {
+                    return contactEmail;
+                }
+
+                public void setContactEmail(String contactEmail) {
+                    this.contactEmail = contactEmail;
+                }
+
+                public int getStartCity() {
+                    return startCity;
+                }
+
+                public void setStartCity(int startCity) {
+                    this.startCity = startCity;
+                }
+
+                public String getStartCityName() {
+                    return startCityName;
+                }
+
+                public void setStartCityName(String startCityName) {
+                    this.startCityName = startCityName;
+                }
+
+                public int getTotalNumber() {
+                    return totalNumber;
+                }
+
+                public void setTotalNumber(int totalNumber) {
+                    this.totalNumber = totalNumber;
+                }
+            }
+
+
+            public static class OrderMemberDetail implements Serializable {
+                private String id;//主键
+                private String memberLevel;//会员等级
+                private String memberLevelId;//会员等级id
+                private String name;//
+                private String orderId;//
+                private int rebate;//
+                private String rentFreeNum;//
+
+                public String getId() {
+                    return id;
+                }
+
+                public void setId(String id) {
+                    this.id = id;
+                }
+
+                public String getMemberLevel() {
+                    return memberLevel;
+                }
+
+                public void setMemberLevel(String memberLevel) {
+                    this.memberLevel = memberLevel;
+                }
+
+                public String getMemberLevelId() {
+                    return memberLevelId;
+                }
+
+                public void setMemberLevelId(String memberLevelId) {
+                    this.memberLevelId = memberLevelId;
+                }
+
+                public String getName() {
+                    return name;
+                }
+
+                public void setName(String name) {
+                    this.name = name;
+                }
+
+                public String getOrderId() {
+                    return orderId;
+                }
+
+                public void setOrderId(String orderId) {
+                    this.orderId = orderId;
+                }
+
+                public int getRebate() {
+                    return rebate;
+                }
+
+                public void setRebate(int rebate) {
+                    this.rebate = rebate;
+                }
+
+                public String getRentFreeNum() {
+                    return rentFreeNum;
+                }
+
+                public void setRentFreeNum(String rentFreeNum) {
+                    this.rentFreeNum = rentFreeNum;
+                }
+
+                public String getContent() {
+                    int discount = rebate / 10;
+                    return "永久" + discount + "折租车，免费用车" + rentFreeNum + "天";
+                }
+            }
         }
     }
 }

plugin_invoice/src/main/res/layout/activity_billing_history.xml

@@ -4,11 +4,17 @@
     android:layout_height="match_parent"
     android:background="@color/colorGrayBg">
 
+    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
+        android:id="@+id/refresh"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
     <android.support.v7.widget.RecyclerView
         android:id="@+id/rv_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
+    </com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
 
     <ImageView
         android:id="@+id/iv_noorder_hint"

plugin_invoice/src/main/res/layout/activity_order_invoicing_car.xml

@@ -10,6 +10,7 @@
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/ll_item_hint"
             android:layout_width="match_parent"
             android:layout_height="@dimen/size_40"
             android:background="@color/colorWrite"
@@ -27,15 +28,20 @@
                 android:textSize="@dimen/text_14" />
         </LinearLayout>
 
-
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/rv_content"
+        <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
+            android:id="@+id/refresh"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_weight="1" />
+            android:layout_weight="1">
 
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/rv_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+        </com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
 
         <LinearLayout
+            android:id="@+id/ll_item_bottom"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/colorWrite"
@@ -108,8 +114,8 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle2"
-                    android:gravity="center"
                     android:enabled="false"
+                    android:gravity="center"
                     android:text="下一步"
                     android:textColor="@color/colorWrite"
                     android:textSize="@dimen/text_16" />

plugin_invoice/src/main/res/layout/rv_item_order_invoicing_car.xml

@@ -67,7 +67,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
-                    android:maxLines="2"
+                    android:maxLines="1"
                     android:text="取：2019-05-15 10:00  欣新房车控股集团（东莞市）"
                     android:textColor="@color/textGray"
                     android:textSize="@dimen/text_12" />
@@ -78,7 +78,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/size_5"
                     android:ellipsize="end"
-                    android:maxLines="2"
+                    android:maxLines="1"
                     android:text="还：2019-05-17 10:00  欣新房车控股集团（东莞市）"
                     android:textColor="@color/textGray"
                     android:textSize="@dimen/text_12" />