浏览代码

修复bug

Pq 3 年之前
父节点
当前提交
e219fa42d9

+ 0 - 1
student/src/main/java/com/cooleshow/student/bean/FriendInfoBean.java

@@ -89,7 +89,6 @@ public class FriendInfoBean {
         public String password;
         public int gender;
         public String certificateType;
-        public int delFlag;
         public int organId;
         public String salt;
         public String organName;

+ 5 - 5
teacher/src/main/java/com/cooleshow/teacher/adapter/WithdrawalRecordAdapter.java

@@ -38,18 +38,18 @@ public class WithdrawalRecordAdapter extends BaseQuickAdapter<WithdrawalRecordBe
         tv_date.setText(item.createTime);
         tv_price.setText("¥" + item.amount);
         // pending、交易处理中 succeeded、交易成功 failed、交易失败 ,可用值:pending,succeeded,failed,close
-        if (!TextUtils.isEmpty(item.status)) {
+        if (!TextUtils.isEmpty(item.authStatus)) {
             tv_state.setVisibility(View.VISIBLE);
-            switch (item.status) {
-                case "pending":
+            switch (item.authStatus) {
+                case "DOING":
                     tv_state.setText("审核中");
                     tv_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_666666));
                     break;
-                case "succeeded":
+                case "PASS":
                     tv_state.setText("结算成功");
                     tv_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
                     break;
-                case "failed":
+                case "UNPASS":
                     tv_state.setText("结算失败");
                     tv_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff5c5f));
                     break;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/bean/AccountDetailBean.java

@@ -18,7 +18,7 @@ public class AccountDetailBean {
      */
     public float amountFrozen;
     public String amountTotal;
-    public float amountUsable;
+    public String amountUsable;
     public String createTime;
     public int status;
     public String updateTime;

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/bean/WithdrawalRecordBean.java

@@ -42,7 +42,7 @@ public class WithdrawalRecordBean {
          *
          */
         public double actualAmount;
-        public double amount;
+        public String amount;
         public String bankCard;
         public long bankCardId;
         public String bankName;
@@ -54,7 +54,7 @@ public class WithdrawalRecordBean {
         public String openType;
         public String phone;
         public double plantformFee;
-        public String status;
+        public String authStatus;
         public String transNo;
         public String transferTime;
         public String updateTime;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/income/MineIncomeActivity.java

@@ -189,7 +189,7 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
         if (null == data) {
             return;
         }
-        viewBinding.tvBalance.setText(data.amountTotal + "");
+        viewBinding.tvBalance.setText(data.amountUsable + "");
     }
 
     @Override

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalRecordActivity.java

@@ -246,11 +246,11 @@ public class WithdrawalRecordActivity extends BaseMVPActivity<ActivityWithdrawal
                 @Override
                 public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                     Object object = withdrawalFilterAdapter.getData().get(position);
-                    if (object instanceof CourseFilterStatusBean) {
+                    if (object instanceof WithdrawalFilterBean) {
                         if (withdrawalFilterAdapter != null) {
                             withdrawalFilterAdapter.setSelect(position);
                         }
-                        CourseFilterStatusBean filterStatusBean = (CourseFilterStatusBean) object;
+                        WithdrawalFilterBean filterStatusBean = (WithdrawalFilterBean) object;
                         viewBinding.tvType.setText(filterStatusBean.showText);
                         reBuildFilter(currentSelectDate, filterStatusBean.value);
                     }

+ 1 - 1
usercenter/src/main/java/com/cooleshow/usercenter/bean/UserInfo.java

@@ -35,7 +35,7 @@ public class UserInfo {
 
     public Object roles;
     public String username;
-    public int delFlag;
+//    public boolean delFlag;
     public int lockFlag;
     public String userType;
     public String password;