bind ali pay account

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

@@ -43,6 +43,7 @@ public class UserEntity implements Serializable {
     private String total_withdraw;//0,
     private String wx_openid;//
     private String wx_nickname;
+    private String ali_account;
     private String share_link;
     private int newbie_task_status;
     private int is_new;//1新用户 2老用户
@@ -98,6 +99,14 @@ public class UserEntity implements Serializable {
         this.wx_nickname = wx_nickname;
     }
 
+    public String getAli_account() {
+        return ali_account;
+    }
+
+    public void setAli_account(String ali_account) {
+        this.ali_account = ali_account;
+    }
+
     public String getId() {
         return id;
     }

app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -23,6 +23,7 @@ import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.share.ShareLinkConfig;
 import com.sheep.jiuyan.samllsheep.Config;
@@ -81,8 +82,8 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     TextView tvBirthday;
     @BindView(R.id.personal_info_phone)
     TextView personal_info_phone;
-    @BindView(R.id.personal_info_bind_tx_wx)
-    TextView personal_info_bind_tx_wx;
+    @BindView(R.id.personal_info_bind_tx_ali)
+    TextView personal_info_bind_tx_ali;
     @BindView(R.id.personal_info_bind_qq)
     TextView personal_info_bind_qq;
     @BindView(R.id.personal_info_bind_wx)
@@ -201,7 +202,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
     }
 
     @OnClick({R.id.personal_info_avatar_container, R.id.personal_info_name_container, R.id.personal_info_qr_container,
-            R.id.personal_info_phone_container, R.id.personal_info_bind_tx_wx_container,
+            R.id.personal_info_phone_container, R.id.personal_info_bind_tx_ali_container,
             R.id.personal_info_bind_qq_container, R.id.personal_info_bind_wx_container,
             R.id.personal_info_authentication_container, R.id.llayout_birthday,
             R.id.personal_info_loginname_container, R.id.personal_info_addr_container})
@@ -250,16 +251,17 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                 Jump2View.getInstance().goActUserAddrInfo(activity);
                 USER_INFO_ADDR.onEvent();
                 break;
-            case R.id.personal_info_bind_tx_wx_container:  //跳转到绑定提现微信号的界面
+            case R.id.personal_info_bind_tx_ali_container:  //跳转到绑定提现微信号的界面
+                if (!TextUtils.isEmpty(userEntity.getAli_account())) return;
                 CommonUtil.getInstance().callActionWithUserInfo(new Action1<UserEntity>() {
                     @Override
                     public void call(UserEntity userEntity) {
                         if (userEntity == null) {
                             G.showToast(R.string.error_data);
-                        } else if (TextUtils.isEmpty(userEntity.getWx_openid())) {
-                            Jump2View.getInstance().goNoBindWx(activity, ChangeWxOrTelAct.TYPE_NORMAL);
+                        } else if (TextUtils.isEmpty(userEntity.getAli_account())) {
+                            Jump2View.getInstance().goWithdrawal(activity);
                         } else {
-                            G.showToast("您已经绑定微信");
+                            G.showToast("您已经绑定支付宝账号");
                         }
                     }
                 });
@@ -488,14 +490,10 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
             DataUtil.getInstance().setUserMobile(userEntity.getMobile());
         }
 
-        if (TextUtils.isEmpty(userEntity.getWx_nickname())) {
-            if (TextUtils.isEmpty(userEntity.getWx_openid())) {
-                personal_info_bind_tx_wx.setText("未绑定");
-            } else {
-                personal_info_bind_tx_wx.setText("");
-            }
+        if (TextUtils.isEmpty(userEntity.getAli_account())) {
+            personal_info_bind_tx_ali.setText("未绑定");
         } else {
-            personal_info_bind_tx_wx.setText(userEntity.getWx_nickname());
+            personal_info_bind_tx_ali.setText(userEntity.getAli_account());
         }
         personal_info_bind_qq.setText(userEntity.isBindQQ() ? "去修改" : "去绑定");
         personal_info_bind_wx.setText(userEntity.isBindWx() ? "去修改" : "去绑定");

app/src/main/java/com/sheep/gamegroup/view/activity/WithdrawalAct.java

@@ -268,7 +268,8 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
             ViewUtil.setEnabled(cash_account_tv, false);
             ViewUtil.setText(withdraw_tip_tv, "已绑定支付宝账号");
         } else {
-            ViewUtil.setText(withdraw_tip_tv, "注意：提现请先绑定支付，且支付宝账号的真实姓名必须与小绵羊实名认证的姓名一致，否则无法绑定成功。");
+            ViewUtil.setText(withdraw_tip_tv, "注意：提现请先绑定支付，且支付宝账号的真实姓名必须与小绵羊实名认证的姓名一致，" +
+                    "否则无法绑定成功。");
         }
         if (!TextUtils.isEmpty(realname)) {
             ViewUtil.setEnabled(cash_realname_tv, false);

app/src/main/res/layout/xpersion_info_act_layout.xml

@@ -200,16 +200,16 @@
             <View style="@style/style_item_line_3_0" />
 
             <LinearLayout
-                android:id="@+id/personal_info_bind_tx_wx_container"
+                android:id="@+id/personal_info_bind_tx_ali_container"
                 style="@style/style_item_container">
 
                 <TextView
                     style="@style/style_item_label"
-                    android:text="@string/bind_tx_wx" />
+                    android:text="@string/bind_tx_ali" />
 
 
                 <TextView
-                    android:id="@+id/personal_info_bind_tx_wx"
+                    android:id="@+id/personal_info_bind_tx_ali"
                     style="@style/style_item_end_next" />
             </LinearLayout>
 

app/src/main/res/values/gamegroup_string.xml

@@ -8,6 +8,7 @@
     <string name="bind_qq">绑定QQ号</string>
     <string name="bind_wx">绑定微信号</string>
     <string name="bind_tx_wx">提现微信号</string>
+    <string name="bind_tx_ali">提现支付宝帐号</string>
     <string name="auther">实名认证</string>
 
     <string name="header">头像</string>