提现列表修改

app/src/main/java/com/sheep/gamegroup/model/entity/WithdrawalEty.java

@@ -10,9 +10,9 @@ public class WithdrawalEty {
     private String desc;// "string",
     private int id;// 0,
     private String order_no;// "string",
-    private int pay_status;// 0,
+    private int pay_status;// 0,pay_status 0未付款 1付款中 2已付款 3付款失败
     private int risk_status;// 0,
-    private int status;// 0,
+    private int status;// 0,----0未审核 1系统审核通过 2系统审核不通过等待人工审核 3人工审核不通过 4人工审核通过 (1,4;显示pay_status状态)
     private String surplus_amount;// 0,
     private String total_amount;// 0,
     private String type;// 0,

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.util;
 
+import com.sheep.gamegroup.model.entity.WithdrawalEty;
+
 /**
  * 一些公用的class
  * Created by ljy on 2018/3/21.
@@ -19,14 +21,14 @@ public class CommonUtil {
      * 返回提现审核结果
      * 审核状态 0未审核 1系统审核通过 2系统审核不通过等待人工审核 3人工审核不通过 4人工审核通过
      */
-    public String returnAuditResult(int type){
+    public String returnAuditResult(WithdrawalEty ety){
         String result = "未审核";
-        switch (type){
+        switch (ety.getStatus()){
             case 0:
                 result = "未审核";
                 break;
             case 1:
-                result = "系统审核通过";
+                result = returnPayState(ety);
                 break;
             case 2:
                 result = "等待人工审核";
@@ -35,7 +37,27 @@ public class CommonUtil {
                 result = "人工审核不通过";
                 break;
             case 4:
-                result = "人工审核通过";
+                result = returnPayState(ety);
+                break;
+        }
+        return result;
+    }
+
+    public String returnPayState(WithdrawalEty ety){
+
+        String result = "未付款";
+        switch (ety.getStatus()){
+            case 0:
+                result = "未付款";
+                break;
+            case 1:
+                result = "付款中";
+                break;
+            case 2:
+                result = "已付款";
+                break;
+            case 3:
+                result = "付款失败";
                 break;
         }
         return result;

app/src/main/java/com/sheep/gamegroup/view/adapter/WithdrawalListAdp.java

@@ -66,7 +66,7 @@ public class WithdrawalListAdp extends BaseAdapter {
             e.printStackTrace();
         }
         holder.price_tv.setText("+" + ety.getAmount()+"元");
-        holder.state_tv.setText(CommonUtil.getInstance().returnAuditResult(Integer.valueOf(ety.getStatus())));
+        holder.state_tv.setText(CommonUtil.getInstance().returnAuditResult(ety));
 
         return convertView;
     }