|
|
@@ -150,28 +150,30 @@ class BankCardController
|
|
|
$datalist->card_num = '*******************';
|
|
|
} elseif ($datalist->status == 3) {
|
|
|
$status_name = '已开户';
|
|
|
- }elseif ($datalist->status == 4) {
|
|
|
- $status_name = '请确认您的收货地址及信息,如填写有误请及时联系客服处理。';
|
|
|
+ } elseif ($datalist->status == 4) {
|
|
|
+ $status_name = '请确认您的收货地址及信息,如填写有误请及时联系客服处理。';
|
|
|
+ $datalist->status = 3;
|
|
|
} else {
|
|
|
$status_name = '';
|
|
|
}
|
|
|
- if($param['user_data']['mailing_date']>0){
|
|
|
- if(time()>$param['user_data']['mailing_date']){
|
|
|
+ if ($param['user_data']['mailing_date'] > 0) {
|
|
|
+ if (time() > $param['user_data']['mailing_date']) {
|
|
|
$status_name = '待激活';
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$status_name = '待激活';
|
|
|
}
|
|
|
}
|
|
|
- $is_buy = Db::table('wa_payorder')
|
|
|
+ $is_buy = Db::table('wa_payorder')
|
|
|
->where('user_id', $request->user_data['id'])
|
|
|
->where('is_pay', 2)
|
|
|
->where('goods_type', 6)
|
|
|
->exists();
|
|
|
- if($is_buy){
|
|
|
- $status_name = '已激活,待打款,预计三个工作日';
|
|
|
+ if ($is_buy) {
|
|
|
+ $datalist->status = 4;
|
|
|
+ $status_name = '已激活,待打款,预计三个工作日';
|
|
|
}
|
|
|
- $bank_carddata=Db::table('wa_bank_card')->where('uid',$param['user_data']['id'])->first();
|
|
|
- if($bank_carddata){
|
|
|
+ $bank_carddata = Db::table('wa_bank_card')->where('uid', $param['user_data']['id'])->first();
|
|
|
+ if ($bank_carddata) {
|
|
|
$datalist->number = $bank_carddata->card_number;
|
|
|
}
|
|
|
$datalist->status_name = $status_name;
|
|
|
@@ -214,9 +216,9 @@ class BankCardController
|
|
|
if ($datalist->status < 3) {
|
|
|
throw new \Exception('等待银行卡开户完成,在申请邮寄!');
|
|
|
}
|
|
|
- if(empty($datalist->ranking)){
|
|
|
+ if (empty($datalist->ranking)) {
|
|
|
$ranking = mt_rand(900000, 1200000);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$ranking = $datalist->ranking;
|
|
|
}
|
|
|
Db::table('wa_user_social_cark')->where('id', $datalist->id)->update([
|