Merge branch 'feature/ip_forbit' of wmtx/platform into release

测试资源bug修正
master
廖金灵 5 years ago committed by Gogs
commit dee22176f5

@ -548,7 +548,7 @@ class TestResourceController extends ThinkController
$used_resource = $used_resource ?: 0; $used_resource = $used_resource ?: 0;
$usable_resource = $allVerifyValue - $used_resource;//小于等于这个值自动审核 $usable_resource = $allVerifyValue - $used_resource;//小于等于这个值自动审核
$usable_resource -= $resource; $usable_resource -= $resource;
if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<$availableBalance) { if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<=$availableBalance) {
$data['verify_remark'] = '自动审核'; $data['verify_remark'] = '自动审核';
$data['verify_resource']= $data['apply_resource']; $data['verify_resource']= $data['apply_resource'];
$data['verify_time'] = time(); $data['verify_time'] = time();

@ -500,7 +500,7 @@ class TestResourceController extends BaseController
$used_resource = $used_resource ?: 0; $used_resource = $used_resource ?: 0;
$usable_resource = $allVerifyValue - $used_resource;//小于等于这个值自动审核 $usable_resource = $allVerifyValue - $used_resource;//小于等于这个值自动审核
$usable_resource -= $resource; $usable_resource -= $resource;
if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<$availableBalance) { if ($data['apply_resource'] <= $usable_resource&&$data['apply_resource']<=$availableBalance) {
$data['verify_remark'] = '自动审核'; $data['verify_remark'] = '自动审核';
$data['verify_resource']= $data['apply_resource']; $data['verify_resource']= $data['apply_resource'];
$data['verify_time'] = time(); $data['verify_time'] = time();

Loading…
Cancel
Save