会员部分修改

app/CustomerVip.php

@@ -23,7 +23,8 @@ class CustomerVip extends Model
      */
     public static function getCustomerInformation($phone){
         $self = new self();
-        $info = $self->where('phone',$phone)->where('is_del',0)->first();
+        $date = date('Y-m-d');
+        $info = $self->where('phone',$phone)->where('is_del',0)->where('vip_end_time','>=',$date)->first();
         return $info;
     }
 

app/Http/Controllers/Api/CustomerController.php

@@ -32,10 +32,19 @@ class CustomerController extends Controller
             return self::returnValue(['买家手机号必填'],2000);
         }
 
-        $list = Customer::select('receiverState','receiverCity','receiverAddress','fanTime','phone','name')->where('buyerMobile',$phone)->get();
+        $list = Customer::select('receiverState','receiverCity','receiverAddress','fanTime','phone','name','buyerName')->where('buyerMobile',$phone)->get();
         $list = json_decode(json_encode($list),true);
 
-        return self::returnValue($list,200);
+        $info = CustomerVip::getCustomerInformation($phone);
+        if(!$info){
+            $status = 0;
+        } else {
+            $status = 1;
+        }
+
+        $data['address_list'] = $list;
+        $data['vip_status'] = $status;
+        return self::returnValue($data,200);
     }
 
     /**
@@ -196,6 +205,23 @@ class CustomerController extends Controller
         }
 
         $list = CustomerCoupons::getCustomerCouponsLog($phone);
+
+        $list = array_map(function($value){
+            $item['id'] = $value['id'];
+            $item['coupon_price'] = $value['coupon_price'];
+            $item['end_time'] = date('Y-m-d',strtotime($value['end_time']));
+            $item['is_use'] = $value['is_use'];
+            $item['order_id'] = $value['order_id'];
+            if($value['is_use'] == 1){
+                $item['status'] = 1;
+            } else if(time() <= strtotime($value['end_time'])){
+                $item['status'] = 0;
+            } else {
+                $item['status'] = 1;
+            }
+            $item['use_time'] = $value['use_time'];
+            return $item;
+        },$list);
         return self::returnValue($list,200);
     }