|
@@ -142,7 +142,7 @@ public class AppUsersCashrecordController extends BaseController
|
|
if(null == cashrecord){
|
|
if(null == cashrecord){
|
|
return R.fail("审核失败,记录不存在");
|
|
return R.fail("审核失败,记录不存在");
|
|
}
|
|
}
|
|
- if(cashrecord.getStatus().intValue() != 0){
|
|
|
|
|
|
+ if(cashrecord.getStatus().intValue() != 0 && (appUsersCashrecord.getCallOther() != 0 && cashrecord.getCashOutStatus() != 2)){
|
|
return R.fail("审核失败,当前状态不可审核");
|
|
return R.fail("审核失败,当前状态不可审核");
|
|
}
|
|
}
|
|
AppUser appUser = appUserService.selectAppUserByUserid(cashrecord.getUid());
|
|
AppUser appUser = appUserService.selectAppUserByUserid(cashrecord.getUid());
|
|
@@ -238,6 +238,9 @@ public class AppUsersCashrecordController extends BaseController
|
|
return R.fail("审核失败,未找到对应渠道,请驳回或者人工审核");
|
|
return R.fail("审核失败,未找到对应渠道,请驳回或者人工审核");
|
|
}*/
|
|
}*/
|
|
}
|
|
}
|
|
|
|
+ if(appUsersCashrecord.getCallOther() == 1 && 1 == appUsersCashrecord.getStatus().intValue()){
|
|
|
|
+ update.setCashOutStatus(0L);
|
|
|
|
+ }
|
|
if(2 == appUsersCashrecord.getStatus().intValue()){
|
|
if(2 == appUsersCashrecord.getStatus().intValue()){
|
|
|
|
|
|
//审核驳回 回退用户金额
|
|
//审核驳回 回退用户金额
|