|
@@ -110,7 +110,7 @@ class AccountController extends Curd
|
|
|
} elseif ($item['member_account_classify'] == 'CASH') {
|
|
|
$data['cash'] = $item;
|
|
|
} elseif ($item['member_account_classify'] == 'CARD') {
|
|
|
- if (intval($item['member_account_surplus']) == 0 && intval($item['member_account_added']) == 0){
|
|
|
+ if (intval($item['member_account_surplus']) == 0 && intval($item['member_account_added']) == 0) {
|
|
|
continue;
|
|
|
}
|
|
|
$data['card'][] = $item;
|
|
@@ -181,14 +181,14 @@ class AccountController extends Curd
|
|
|
|
|
|
$card = Card::with([
|
|
|
'main' => function ($query) {
|
|
|
- $query->select('card_main_id', 'card_main_name','card_main_amount','card_main_added');
|
|
|
+ $query->select('card_main_id', 'card_main_name', 'card_main_amount', 'card_main_added');
|
|
|
}
|
|
|
])->where('card_id', $cardId)
|
|
|
->first();
|
|
|
if (!$card || empty($card->main)) {
|
|
|
return json_fail("卡号不存在");
|
|
|
}
|
|
|
- if ($card->card_cdkey != $cardKey){
|
|
|
+ if ($card->card_cdkey != $cardKey) {
|
|
|
return json_fail("秘钥错误,请重新输入");
|
|
|
}
|
|
|
if ($card->is_issue == 'N') {
|
|
@@ -228,9 +228,16 @@ class AccountController extends Curd
|
|
|
// 会员绑定卡
|
|
|
$card->join_card_member_id = $memberId;
|
|
|
$card->join_card_member_account_id = $accountId;
|
|
|
- $card->card_assign_datetime = date('Y-m-d H:i:s');
|
|
|
+// $card->card_assign_datetime = date('Y-m-d H:i:s');
|
|
|
$card->card_deadline_datetime = $duedate;
|
|
|
$card->card_status = 'USED';
|
|
|
+ // 激活时间
|
|
|
+ $cardExtendJson = [];
|
|
|
+ if (!empty($card->card_extend_json)) {
|
|
|
+ $cardExtendJson = json_decode($card->card_extend_json, true);
|
|
|
+ }
|
|
|
+ $cardExtendJson['used_datetime'] = date('Y-m-d H:i:s');
|
|
|
+ $card->card_extend_json = json_encode($cardExtendJson);
|
|
|
$card->save();
|
|
|
|
|
|
// member_account_list 加卡充值记录
|
|
@@ -251,7 +258,7 @@ class AccountController extends Curd
|
|
|
return json_success('success');
|
|
|
} catch (\Exception $e) {
|
|
|
Db::rollBack();
|
|
|
- Log::error("储值卡绑定失败",['msg'=>$e->getMessage()]);
|
|
|
+ Log::error("储值卡绑定失败", ['msg' => $e->getMessage()]);
|
|
|
return json_fail("绑定失败");
|
|
|
}
|
|
|
}
|