|
@@ -18,6 +18,7 @@ use App\Goods;
|
18
|
18
|
use App\GoodsSkus;
|
19
|
19
|
use App\Http\Controllers\Controller;
|
20
|
20
|
use Illuminate\Http\Request;
|
|
21
|
+use Illuminate\Support\Facades\DB;
|
21
|
22
|
|
22
|
23
|
class CustomerController extends Controller
|
23
|
24
|
{
|
|
@@ -38,10 +39,10 @@ class CustomerController extends Controller
|
38
|
39
|
$info = CustomerVip::getCustomerInformation($phone);
|
39
|
40
|
if(!$info){
|
40
|
41
|
$status = 0;
|
41
|
|
- $name = $info->name;
|
|
42
|
+ $name = '';
|
42
|
43
|
} else {
|
43
|
44
|
$status = 1;
|
44
|
|
- $name = '';
|
|
45
|
+ $name = $info->name;
|
45
|
46
|
}
|
46
|
47
|
|
47
|
48
|
$data['address_list'] = $list;
|
|
@@ -80,6 +81,7 @@ class CustomerController extends Controller
|
80
|
81
|
$birth_etime = date('m-t', strtotime($customerInfo->birthday));
|
81
|
82
|
$today = date('m-d');
|
82
|
83
|
|
|
84
|
+ $birthdayGiftStatus = 0;
|
83
|
85
|
if($today>=$birth_stime && $today<=$birth_etime){
|
84
|
86
|
//生日期内,判断是否已领
|
85
|
87
|
$if_b_gift = DB::table('customer_gift_receives')->where('phone', $phone)->where('is_del',0)->where('gift_type', 1)->where('dtime', '>=', $mtime)->first();
|