|
@@ -95,6 +95,12 @@ class WithdrawalListController extends Curd
|
|
|
$item['member_is_referrer'] = isset($item['member']) ? $item['member']['member_is_referrer'] : '';
|
|
|
|
|
|
unset($item['member'], $item['memberInfo'], $item['memberCert']);
|
|
|
+ if (!empty($item['member_account_list_extend_json'])){
|
|
|
+ $memberAccountListExtendJson = json_decode($item['member_account_list_extend_json'],true);
|
|
|
+ if (isset($memberAccountListExtendJson['reason'])){
|
|
|
+ $item['reason'] = $memberAccountListExtendJson['reason'];
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
return $items;
|
|
@@ -134,6 +140,16 @@ class WithdrawalListController extends Curd
|
|
|
]
|
|
|
];
|
|
|
}
|
|
|
+ if (!empty($info->member_account_list_extend_json)) {
|
|
|
+ $memberAccountListExtendJson = json_decode($info->member_account_list_extend_json, true);
|
|
|
+ if (isset($memberAccountListExtendJson['reason'])){
|
|
|
+ $info->reason = $memberAccountListExtendJson['reason'];
|
|
|
+ }
|
|
|
+ if (isset($memberAccountListExtendJson['resulttime'])){
|
|
|
+ $info->resulttime = $memberAccountListExtendJson['resulttime'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// $info->banks = ClientConfig::where('join_client_config_member_id',$info->join_member_account_list_member_id)->where('client_config_key','client-bank')->get()->toArray();
|
|
|
|
|
|
return json_success('success', $info);
|
|
@@ -156,8 +172,13 @@ class WithdrawalListController extends Curd
|
|
|
if (!empty($withdraw->member_account_list_json)) {
|
|
|
$memberAccountListJson = json_decode($withdraw->member_account_list_json, true);
|
|
|
}
|
|
|
+ $memberAccountListExtendJson = [];
|
|
|
+ if (!empty($withdraw->member_account_list_extend_json)) {
|
|
|
+ $memberAccountListExtendJson = json_decode($withdraw->member_account_list_extend_json, true);
|
|
|
+ }
|
|
|
if ($status == 'ACTIVED') {
|
|
|
$memberAccountListJson['resulttime'] = date('Y-m-d H:i:s');
|
|
|
+ $memberAccountListExtendJson['resulttime'] = date('Y-m-d H:i:s');
|
|
|
// 扣账户余额
|
|
|
$account = MemberAccount::where('join_account_member_id', $withdraw->join_member_account_list_member_id)
|
|
|
->where('member_account_classify', 'CASH')
|
|
@@ -172,7 +193,11 @@ class WithdrawalListController extends Curd
|
|
|
$account->member_account_surplus = $account->member_account_surplus - $withdraw->member_account_list_amount;
|
|
|
$account->member_account_expend = $account->member_account_expend + $withdraw->member_account_list_amount;
|
|
|
$account->save();
|
|
|
+ } else if ($status == 'CANCEL') {
|
|
|
+ $memberAccountListExtendJson['resulttime'] = date('Y-m-d H:i:s');
|
|
|
+ $memberAccountListExtendJson['reason'] = $request->post('reason', '');
|
|
|
}
|
|
|
+ $withdraw->member_account_list_extend_json = json_encode($memberAccountListExtendJson);
|
|
|
$withdraw->member_account_list_outed = 'Y';
|
|
|
$withdraw->save();
|
|
|
|
|
@@ -184,7 +209,7 @@ class WithdrawalListController extends Curd
|
|
|
// 入收支记录
|
|
|
$params['account_list_id'] = $memberAccountListId;
|
|
|
$params['type'] = 'withdraw';
|
|
|
- Event::dispatch('statistics.inout.out',$params);
|
|
|
+ Event::dispatch('statistics.inout.out', $params);
|
|
|
}
|
|
|
|
|
|
return json_success('success');
|