修改提现规则

game-business/src/main/java/com/game/business/controller/AppUsersCashrecordController.java

@@ -151,15 +151,15 @@ public class AppUsersCashrecordController extends BaseController
         update.setId(cashrecord.getId());
         update.setStatus(appUsersCashrecord.getStatus());
         update.setReason(appUsersCashrecord.getReason());
-        if(appUsersCashrecord.getCallOther() == 0 && 1== appUsersCashrecord.getStatus().intValue() &&
+        /*if(appUsersCashrecord.getCallOther() == 0 && 1== appUsersCashrecord.getStatus().intValue() &&
                 (null == appUsersCashrecord.getCashChannelId() || appUsersCashrecord.getCashChannelId() < 1)){
             return R.fail("审核失败，未找到对应渠道，请驳回或者人工审核");
-        }
-        if(1 == appUsersCashrecord.getStatus().intValue() && null != appUsersCashrecord.getCashChannelId() && appUsersCashrecord.getCashChannelId() > 0
+        }*/
+        if(1 == appUsersCashrecord.getStatus().intValue()
          && appUsersCashrecord.getCallOther() == 0){
             //审核通过
             String key = "";
-            switch (appUsersCashrecord.getType().intValue()){
+            switch (cashrecord.getType().intValue()){
                 case 1: //支付宝
                     key = "alipay";
                     break;
@@ -184,13 +184,13 @@ public class AppUsersCashrecordController extends BaseController
                 String extra = "";
                 if(Arrays.asList("8092","8095").contains(appChargeChannel.getChannelKey())){
                     //钱包提现
-                    extra = appUsersCashrecord.getAccount();
+                    extra = cashrecord.getAccount();
                 }else{
-                    AppUsersCashAccount appUsersCashAccount = appUsersCashAccountService.selectAppUsersCashAccountById(appUsersCashrecord.getCashAccountId());
+                    AppUsersCashAccount appUsersCashAccount = appUsersCashAccountService.selectAppUsersCashAccountById(cashrecord.getCashAccountId());
                     if(null != appUsersCashAccount) {
                         JSONObject jsonObject = new JSONObject();
-                        jsonObject.put("cardNumber", appUsersCashrecord.getAccount());
-                        jsonObject.put("bankName", URLEncoder.encode(appUsersCashrecord.getAccountBank(),"UTF-8"));
+                        jsonObject.put("cardNumber", cashrecord.getAccount());
+                        jsonObject.put("bankName", URLEncoder.encode(cashrecord.getAccountBank(),"UTF-8"));
                         jsonObject.put("branchName", URLEncoder.encode(appUsersCashAccount.getBranch(),"UTF-8"));
                         jsonObject.put("ownerName", URLEncoder.encode(appUsersCashAccount.getName(),"UTF-8"));
                         extra = jsonObject.toString();