会员详情列表修改

app/Http/Controllers/Admin/CustomerDepositController.php

@@ -737,7 +737,7 @@ class CustomerDepositController extends Controller
         $phone = $request->input('phone');
 
         #查询会员领取情况以及基本信息
-        $monthGiftLog = CustomerGiftReceives::getCustomerReceivesLog($phone,0);
+//        $monthGiftLog = CustomerGiftReceives::getCustomerReceivesLog($phone,0);
         $customerInformation = CustomerVip::getCustomerInformation($phone);
         $data = array();
 
@@ -760,21 +760,21 @@ class CustomerDepositController extends Controller
         $list = array();
         #将数据对应填写
         foreach ($data as $value) {
-            foreach ($monthGiftLog as $v) {
-                if(($value['start_time'] <= $v['dtime']) && ($v['dtime'] <= $value['end_time'])){
-                    $value['order_id'] = $v['order_id'];
-                    $value['dtime'] = $v['dtime'];
-                    $value['status'] = '已使用';
-                    $giftInfo = CustomerMonthGift::find($v['gift_id']);
-                    $goodsId = $giftInfo->goods_id;
-                    $goodsInfo = Goods::find($goodsId);
-                    $value['goods_id'] = $goodsId;
-                    $value['goods_name'] = $goodsInfo->name;
-                } else if($value['end_time'] < date('Y-m-d')){
-                    $value['status'] = '已过期';
-                } else {
-                    $value['status'] = '未使用';
-                }
+            $monthGiftLog = CustomerGiftReceives::where('phone',$phone)->where('gift_type',0)
+                ->where('dtime','>=',$value['start_time'])->where('dtime','<=',$value['end_time'])->first();
+            if($monthGiftLog){
+                $value['order_id'] = $monthGiftLog['order_id'];
+                $value['dtime'] = $monthGiftLog['dtime'];
+                $value['status'] = '已使用';
+                $giftInfo = CustomerMonthGift::find($monthGiftLog['gift_id']);
+                $goodsId = $giftInfo->goods_id;
+                $goodsInfo = Goods::find($goodsId);
+                $value['goods_id'] = $goodsId;
+                $value['goods_name'] = $goodsInfo->name;
+            } else if($value['end_time'] < date('Y-m-d')){
+                $value['status'] = '已过期';
+            } else {
+                $value['status'] = '未使用';
             }
             $list[] = $value;
         }

resources/views/customer/customerbirthdaygiftlist.blade.php

@@ -9,7 +9,7 @@
 
     <div class="page-container">
         <div>
-
+            <button class="btn btn-default" type="reset" onclick="self.location=document.referrer;">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;
         </div>
         <div class="mt-20">
             <table class="table table-border table-bordered table-bg table-hover table-sort">

resources/views/customer/customercouponlist.blade.php

@@ -9,7 +9,7 @@
 
     <div class="page-container">
         <div>
-
+            <button class="btn btn-default" type="reset" onclick="self.location=document.referrer;">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;
         </div>
         <div class="mt-20">
             <table class="table table-border table-bordered table-bg table-hover table-sort">

resources/views/customer/customermonthgiftlist.blade.php

@@ -9,7 +9,7 @@
 
     <div class="page-container">
         <div>
-
+            <button class="btn btn-default" type="reset" onclick="self.location=document.referrer;">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;
         </div>
         <div class="mt-20">
             <table class="table table-border table-bordered table-bg table-hover table-sort">