合并

app/CustomerCoupons.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: shensong
+ * Date: 2019/11/27
+ * Time: 17:07
+ */
+
+namespace App;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+class CustomerCoupons extends Model
+{
+    protected $table = 'customer_coupons';
+    public $timestamps = false;
+}

app/CustomerMonthGift.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: shensong
+ * Date: 2019/11/28
+ * Time: 17:28
+ */
+
+namespace App;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+class CustomerMonthGift extends Model
+{
+    public $timestamps = false;
+    protected $table = 'customer_month_gift';
+}

app/CustomerVip.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: shensong
+ * Date: 2019/11/27
+ * Time: 17:06
+ */
+
+namespace App;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+class CustomerVip extends Model
+{
+    public $timestamps = false;
+    protected $table = 'customer_vip';
+}

app/Error.php

@@ -12,6 +12,7 @@ class Error
      */
     public static $errCodes = [
 
+
         0    => "成功",
         200  =>'请求成功',
         1001 => '未分配销售',
@@ -19,6 +20,7 @@ class Error
         2000 =>'请求参数不合法',
         2001 =>'未查询到有效数据',
         2002 =>'密码错误',
+        2003 =>'充值卡余额不足',
     ];
     /**
      * 返回错误码

app/Http/Controllers/Admin/CustomerDepositController.php

@@ -6,8 +6,14 @@
  * Time: 上午11:20
  */
 namespace  App\Http\Controllers\Admin;
+use App\CustomerCoupons;
+use App\CustomerMonthGift;
+use App\CustomerVip;
+use App\Goods;
+use App\GoodsSkus;
 use App\Http\Controllers\Controller;
 use App\Admin;
+use function GuzzleHttp\Psr7\str;
 use Illuminate\Http\Request;
 use App\CustomerInfo;
 use App\CustomerDeposit;
@@ -334,4 +340,365 @@ class CustomerDepositController extends Controller
         return 1;
     }
 
+    /**
+     * vip用户列表
+     * @param Request $request
+     */
+    public function vipCustomerList(Request $request) {
+        $page = (int)$request->input('page');
+        $name = $request->input('name');
+        $phone = $request->input('phone');
+
+        $admin_id = (int)$request->input('admin_id');
+        $team_id = (int)$request->input('team_id');
+
+        $self_role = session('role_name');
+
+        if($self_role == '管理员'){
+            //只能看自己团队的
+            $self_id = session('admin_id');
+            $team_id = DB::table('admin')->where('id', $self_id)->pluck('team_id');
+        }
+
+        //假如有团队筛选，检索销售队员
+        $saler_ids = null;
+
+        if($team_id>0 && !$admin_id){
+            $saler_ids = DB::table('admin')->where('team_id', $team_id)->lists('id');
+        }
+
+        $pageSize = 20;
+        if($page<=0){
+            $page = 1;
+        }
+
+        $offset = ($page-1) * $pageSize;
+        $count = CustomerVip::where(function($query) use ($name,$phone,$admin_id,$saler_ids) {
+            if($phone) $query->where('phone', $phone);
+            if($name) $query->where('name', 'like', '%'. $name. '%');
+            if($admin_id) $query->where('admin_id', $admin_id);
+            if( !empty($saler_ids) ) $query->whereIn('admin_id', $saler_ids);
+        })->count();
+        if ($count > 1) {
+            // 总页数
+            $pages = ceil($count/$pageSize);
+        }else{
+            // 总页数
+            $pages = 1;
+        }
+        $result = CustomerVip::where(function($query) use($phone, $name, $admin_id, $saler_ids){
+            if($phone) $query->where('phone', $phone);
+            if($name) $query->where('name', 'like', '%'. $name. '%');
+            if($admin_id) $query->where('admin_id', $admin_id);
+            if( !empty($saler_ids) ) $query->whereIn('admin_id', $saler_ids);
+        })->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
+        $result = json_decode(json_encode($result),true);
+
+
+        $teamList = DB::table('teams')->select('id', 'name')->where(function($query) use($team_id, $self_role){
+            if($self_role == '管理员') $query->where('id', $team_id);
+        })->where('type', 1)->get();
+        $teamList = json_decode(json_encode($teamList), true);
+
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
+            if($self_role == '管理员') $query->where('team_id', $team_id);
+        })->where('id','>', 1)->get();
+        $adminList = json_decode(json_encode($adminList), true);
+
+        return view('customer/vipCustomerList', [
+            'result' =>$result,
+            'page'              =>$page,
+            'count'             =>$count,
+            'pages'             =>$pages,
+            'phone'             =>$phone,
+            'name'              =>$name,
+            'teamlist'          =>$teamList,
+            'adminlist'         =>$adminList,
+            'team_id'           =>$team_id,
+            'admin_id'          =>$admin_id,
+            'self_role'         =>$self_role,
+        ]);
+    }
+
+    /**
+     * 添加vip用户页面
+     * @param Request $request
+     */
+    public function addVipCustomer(Request $request) {
+        $self_role = session('role_name');
+        $team_id = null;
+        if($self_role == '管理员'){
+            //只能看自己团队的
+            $self_id = session('admin_id');
+            $team_id = DB::table('admin')->where('id', $self_id)->pluck('team_id');
+        }
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
+            if($self_role == '管理员') $query->where('team_id', $team_id);
+        })->where('id','>', 1)->get();
+        $adminList = json_decode(json_encode($adminList), true);
+        return view('customer/vipCustomerCreate',[
+            'adminlist' => $adminList,
+        ]);
+    }
+
+    /**
+     * 添加vip用户信息
+     * @param Request $request
+     */
+    public function storeVipCustomer(Request $request) {
+
+        $this->validate($request, [
+            'phone' => 'required',
+            'birthday' => 'required',
+        ], [
+            'phone.required' => '手机号不能为空',
+            'birthday.required' => '必须填写用户生日',
+        ]);
+
+        //添加vip用户
+        $customerVip = new CustomerVip();
+        $customerVip->phone = $request->input('phone');
+        $customerVip->name = $request->input('name');
+        $customerVip->admin_id = $request->input('admin_id');
+        $customerVip->level = 1;
+        $customerVip->discount = 95;
+        $customerVip->create_time = date('Y-m-d H:i:s',time());
+        $customerVip->vip_end_time = date('Y-m-d H:i:s',strtotime('+1 year'));
+        $customerVip->birthday = $request->input('birthday');
+        $customerVip->is_del = 0;
+
+        if($customerVip->save()) {
+            //添加优惠券
+            for($i=1;$i<=6;$i++){
+                $customerCoupons = new CustomerCoupons();
+                $customerCoupons->phone = $request->input('phone');
+                $customerCoupons->coupon_price = 30;
+                $customerCoupons->create_time = date('Y-m-d H:i:s',time());
+                $customerCoupons->end_time = date('Y-m-d',strtotime('+3 months'));
+                $customerCoupons->is_use = 0;
+                $customerCoupons->save();
+            }
+        }
+
+        return redirect('/admin/customer/vipList')->with('info', '添加成功');
+    }
+
+    /**
+     * 编辑vip用户页面
+     * @param Request $request
+     */
+    public function editVipCustomer(Request $request) {
+        $id = $request->input('id');
+        $self_role = session('role_name');
+        $team_id = null;
+        if($self_role == '管理员'){
+            //只能看自己团队的
+            $self_id = session('admin_id');
+            $team_id = DB::table('admin')->where('id', $self_id)->pluck('team_id');
+        }
+        $customer = CustomerVip::findOrFail($id);
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
+            if($self_role == '管理员') $query->where('team_id', $team_id);
+        })->where('id','>', 1)->get();
+        $adminList = json_decode(json_encode($adminList), true);
+        return view('customer/vipCustomerEdit',[
+            'info'=>$customer,
+            'adminlist' => $adminList,
+            ]);
+    }
+
+    /**
+     * 编辑vip用户信息
+     * @param Request $request
+     */
+    public function updateVipCustomer(Request $request) {
+        $id = $request->input('id');
+        //修改vip用户信息
+        $customerVip = CustomerVip::findOrFail($id);
+        $customerVip->name = $request->input('name');
+        $customerVip->birthday = $request->input('birthday');
+        $customerVip->admin_id = $request->input('admin_id');
+        if($customerVip->save()){
+            return redirect('/admin/customer/vipList')->with('info', '编辑成功');
+        } else {
+            return redirect('/admin/customer/vipUpdate?id='.$id)->with('info', '编辑失败');
+        }
+
+    }
+
+    /**
+     * 启用vip用户
+     * @param Request $request
+     */
+    public function vipUp(Request $request) {
+        $id = $request->input('id');
+        $res = CustomerVip::where('id',$id)->update(['is_del'=>0]);
+        if($res) exit('1');
+        exit('0');
+    }
+
+    /**
+     * 禁用vip用户
+     * @param Request $request
+     */
+    public function vipDel(Request $request) {
+        $id = $request->input('id');
+        $res = CustomerVip::where('id',$id)->update(['is_del'=>1]);
+        if($res) exit('1');
+        exit('0');
+    }
+
+    /**
+     * 会员用户礼品列表
+     * @param Request $request
+     */
+    public function monthGiftList(Request $request) {
+        $page = $request->input('page',1);
+        $type = $request->input('type');
+        $pageSize = 20;
+        if($page<=0){
+            $page = 1;
+        }
+
+        $offset = ($page-1) * $pageSize;
+        $count = CustomerMonthGift::where(function($query) use ($type) {
+            if($type && ($type != '-1')) $query->where('type',$type);
+        })->count();
+        if ($count > 1) {
+            // 总页数
+            $pages = ceil($count/$pageSize);
+        }else{
+            // 总页数
+            $pages = 1;
+        }
+        $result = CustomerMonthGift::where(function($query) use ($type) {
+            if($type && ($type != '-1')) $query->where('type',$type);
+        })->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
+        $result = json_decode(json_encode($result),true);
+        $result = array_map(function($value){
+            $item = $value;
+            $sku = GoodsSkus::select('propsName','price','is_white','quantity','is_weigh')->where('id', $value['sku_id'])->where('is_del', 0)->first();
+            $goods = Goods::select('name','picUrl','goodsCategoryName')->where('is_del', 0)->where('id', $value['goods_id'])->first();
+            $item['sku'] = $sku;
+            $item['goods'] = $goods;
+            return $item;
+        },$result);
+
+        return view('customer/customerGiftList',[
+            'page'  => $page,
+            'pages' => $pages,
+            'count' => $count,
+            'result'=> $result,
+            'type'  => $type,
+        ]);
+    }
+
+
+    /**
+     * 添加礼品页面
+     */
+    public function addMonthGift() {
+        return view('customer/customerGiftAdd');
+    }
+
+    /**
+     * 编辑礼品页面
+     * @param Request $request
+     */
+    public function editMonthGift(Request $request) {
+        $id = $request->input('id');
+        $gift = CustomerMonthGift::findOrFail($id);
+        $goods = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName as props_name', 'gs.price', 'gs.is_weigh')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('gs.id', $gift->sku_id)->orderBy('goods.id', 'desc')->first();
+        return view('customer/customerGiftEdit',[
+            'info'  => $gift,
+            'good' => $goods,
+        ]);
+    }
+
+    /**
+     * 添加礼品信息
+     * @param Request $request
+     */
+    public function monthGiftStore(Request $request) {
+        #数据校验
+        $this->validate( $request ,[
+                'mtime' => 'required',
+            ],[
+                'mtime.required' => '日期必填',
+            ]
+        );
+
+        #数据处理
+        $type = $request->input('type');
+        $mtime = date('Y-m-01',strtotime($request->input('mtime')));
+        $skus = $request->input('skus');
+        $sku_id = $skus[0];
+        $gnum = $request->input('gnum');
+        $num = $gnum[0];
+
+        //根据规格id反向查询商品goods_id
+        $sku = GoodsSkus::find($sku_id);
+        $goods_id = $sku['goodsCode'];
+
+        #数据存储
+        $gift = new CustomerMonthGift();
+        $gift->mtime = $mtime;
+        $gift->goods_id = $goods_id;
+        $gift->sku_id = $sku_id;
+        $gift->type = $type;
+        $gift->num = $num;
+        $gift->create_time = date('Y-m-d H:i:s',time());
+        $res = $gift->save();
+
+        #结果返回
+        if($res){
+            return redirect('/admin/customer/giftList')->with('info','添加成功');
+        } else {
+            return back()->with('info','添加失败');
+        }
+    }
+
+    /**
+     * 编辑礼品信息
+     * @param Request $request
+     */
+    public function monthGiftUpdate(Request $request) {
+        #数据校验
+        $this->validate( $request ,[
+            'mtime' => 'required',
+        ],[
+                'mtime.required' => '日期必填',
+            ]
+        );
+
+        #数据处理
+        $type = $request->input('type');
+        $id = $request->input('id');
+        $mtime = date('Y-m-01',strtotime($request->input('mtime')));
+        $skus = $request->input('skus');
+        $sku_id = $skus[0];
+        $gnum = $request->input('gnum');
+        $num = $gnum[0];
+
+        //根据规格id反向查询商品goods_id
+        $sku = GoodsSkus::find($sku_id);
+        $goods_id = $sku['goodsCode'];
+
+        #数据存储
+        $gift = CustomerMonthGift::findOrFail($id);
+        $gift->mtime = $mtime;
+        $gift->goods_id = $goods_id;
+        $gift->sku_id = $sku_id;
+        $gift->type = $type;
+        $gift->num = $num;
+        $res = $gift->save();
+
+        #结果返回
+        if($res){
+            return redirect('/admin/customer/giftList')->with('info','修改成功');
+        } else {
+            return back()->with('info','修改失败');
+        }
+    }
+
 }

app/Http/Controllers/Admin/OrderController.php

@@ -485,7 +485,29 @@ class OrderController extends Controller
         $self_role = session('role_name');
         $createTime = date('Y-m-d H:i:s');
 
-        return view('order/ordercreate', ['categorylist' => $catelist, 'adminlist'=>$adminList, 'teamlist'=>$teamList, 'self_role'=>$self_role, 'createTime'=>$createTime, 'last_url' => $_SERVER['HTTP_REFERER']]);
+        //当月礼品
+        $mtime = date('Y-m-01');
+        $gift_info = DB::table('customer_month_gift')->where('mtime', $mtime)->get();
+        $gift_info = json_decode(json_encode($gift_info), true);
+        $m_gift=array();
+        $b_gift=array();
+        foreach($gift_info as $k=>$v){
+            //获取礼品信息
+            $goods_name = Goods::where('id', $v['goods_id'])->pluck('name');
+            $sku = GoodsSkus::where('id', $v['sku_id'])->first();
+            $data = array();
+            $data['id'] = $v['id'];
+            $data['goods_name'] = $goods_name;
+            $data['propsName'] = $sku['propsName'];
+            $data['price'] = $sku['price'];
+            if($v['type'] == 0){
+                $m_gift[] = $data;
+            }else{
+                $b_gift[] = $data;
+            }
+        }
+
+        return view('order/ordercreate', ['categorylist' => $catelist, 'adminlist'=>$adminList, 'teamlist'=>$teamList, 'self_role'=>$self_role, 'createTime'=>$createTime, 'last_url' => $_SERVER['HTTP_REFERER'], 'm_gift'=>$m_gift, 'b_gift'=>$b_gift]);
     }
     /**
      * 分组管理-进行添加操作
@@ -498,6 +520,7 @@ class OrderController extends Controller
             'customerName'           => 'required|between:1,6', 
             'receiverName'           => 'required|between:1,6', 
             'receiverMobile'           => 'required|regex:/^1[3456789]\d{9}$/',  
+            'buyer_phone'           => 'required|regex:/^1[3456789]\d{9}$/',  
             'fanTime'           => 'required|date', 
             'receiverState'           => 'required|between:1,5', 
             'receiverCity'           => 'required|between:1,10', 
@@ -514,6 +537,7 @@ class OrderController extends Controller
             'receiverName.required'           => '收货人不能为空', 
             'receiverName.between'           => '收货人不能超过6个字符',                  
             'receiverMobile.required'           => '收货人手机号不能为空',                   
+            'buyer_phone.required'           => '买家手机号不能为空',                   
             'receiverMobile.regex'           => '收货人手机号格式有误',                   
             'fanTime.required'           => '加粉时间不能为空',              
             'receiverState.required'           => '省不能为空',   
@@ -625,6 +649,13 @@ class OrderController extends Controller
         $order['delivery_date'] = !empty($request->input('delivery_date')) ? $request->input('delivery_date') : date('Y-m-d'); //发货日期
         $order['order_status'] = (int)$request->input('order_status');
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
+        $order['buyer_phone'] = $request->input('buyer_phone'); 
+        $order['use_coupon'] = (int)$request->input('use_coupon'); 
+        $order['use_b_gift'] = (int)$request->input('use_b_gift'); 
+        $m_gift_id = (int)$request->input('m_gift_id');
+        if($m_gift_id>0){
+            $order['use_m_gift'] = 1;
+        }
        
         //充值卡验证余额
         if($order['payment_type'] == 4){
@@ -698,6 +729,63 @@ class OrderController extends Controller
                     $order_skus_insert = DB::table('order_goods_skus')->insert($order_skus);
                 }
 
+                #加赠品逻辑
+                $use_coupon = (int)$request->input('use_coupon');
+                $use_b_gift = (int)$request->input('use_b_gift');
+                if($use_coupon == 1){
+                    $coupon = DB::table('customer_coupons')->where('phone', $order['buyer_phone'])->where('is_use',0)->orderBy('id', 'desc')->first();
+                    if(!empty($coupon)){
+                        $cup = array();
+                        $cup['is_use'] = 1;
+                        $cup['use_time'] = date('Y-m-d H:i:s');
+                        $cup['order_id'] = $res;
+                        DB::table('customer_coupons')->where('id', $coupon->id)->update($cup);
+                    }
+                }
+                if($m_gift_id>0){
+                    $m_gift = DB::table('customer_month_gift')->where('id', $m_gift_id)->where('type', 0)->first();
+                    $order_m_gift = array();
+                    $m_sku = GoodsSkus::where('id', $m_gift->sku_id)->first();
+                    $order_m_gift['sku_id'] = $m_gift->sku_id;
+                    $order_m_gift['order_id'] = $res;
+                    $order_m_gift['goods_id'] = $m_sku->goodsCode;
+                    $order_m_gift['num'] = $m_gift->num;
+                    $order_m_gift['price'] = $m_sku->price;
+                    $order_m_gift['gift_id'] = $m_gift_id;
+                    $order_gift_insert = DB::table('order_goods_skus')->insert($order_m_gift);
+                    #记录领取
+                    $receive_gift = array();
+                    $receive_gift['phone'] = $order['buyer_phone'];
+                    $receive_gift['dtime'] = date('Y-m-d');
+                    $receive_gift['order_id'] = $res;
+                    $receive_gift['gift_id'] = $m_gift_id;
+                    $receive_gift['gift_type'] = 0;
+                    DB::table('customer_gift_receives')->insert($receive_gift);
+                }
+                $mdate = date('Y-m-01');
+                if($use_b_gift>0){
+                    $b_gifts = DB::table('customer_month_gift')->where('mtime', $mdate)->where('type', 1)->get();
+                    $b_gifts = json_decode(json_encode($b_gifts),true);
+                    foreach($b_gifts as $b_gift){
+                        $order_b_gift = array();
+                        $b_sku = GoodsSkus::where('id', $b_gift['sku_id'])->first();
+                        $order_b_gift['sku_id'] = $b_gift['sku_id'];
+                        $order_b_gift['order_id'] = $res;
+                        $order_b_gift['goods_id'] = $b_sku->goodsCode;
+                        $order_b_gift['num'] = $b_gift['num'];
+                        $order_b_gift['price'] = $b_sku->price;
+                        $order_b_gift['gift_id'] = $b_gift['id'];
+                        $order_gift_insert = DB::table('order_goods_skus')->insert($order_b_gift);
+                    }
+                    #记录领取
+                    $receive_gift = array();
+                    $receive_gift['phone'] = $order['buyer_phone'];
+                    $receive_gift['dtime'] = date('Y-m-d');
+                    $receive_gift['order_id'] = $res;
+                    $receive_gift['gift_type'] = 1;
+                    DB::table('customer_gift_receives')->insert($receive_gift);
+                }
+
                 #新加逻辑，若付款方式为充值卡/消费记录
                 if($order['payment_type'] == 4){
                     $consum = new CustomerConsum();
@@ -763,7 +851,7 @@ class OrderController extends Controller
         //$order['deposit_phone'] = $order['receiverMobile'];
         $order['receiverMobile'] = substr($order['receiverMobile'], 0, 3).'****'.substr($order['receiverMobile'], 7);
         $order['goods'] = '';
-        $order_skus = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->lists('num','sku_id');
+        $order_skus = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->whereNull('gift_id')->lists('num','sku_id');
 
         $skus = array_keys($order_skus);
         if(!empty($skus)){
@@ -783,6 +871,71 @@ class OrderController extends Controller
             $consum = CustomerConsum::select('phone')->where('order_id', $id)->first();
             $deposit_phone = isset($consum->phone) ? $consum->phone : '';
         }
+
+        //下单当月礼品
+        $mtime = date('Y-m-01', strtotime($order['create_time']));
+        $gift_info = DB::table('customer_month_gift')->where('mtime', $mtime)->get();
+        $gift_info = json_decode(json_encode($gift_info), true);
+        $m_gift=array();
+        $b_gift=array();
+        foreach($gift_info as $k=>$val){
+            //获取礼品信息
+            $goods_name = Goods::where('id', $val['goods_id'])->pluck('name');
+            $sku = GoodsSkus::where('id', $val['sku_id'])->first();
+            $data = array();
+            $data['id'] = $val['id'];
+            $data['goods_name'] = $goods_name;
+            $data['propsName'] = $sku['propsName'];
+            $data['price'] = $sku['price'];
+            if($val['type'] == 0){
+                $m_gift[] = $data;
+            }else{
+                $b_gift[] = $data;
+            }
+        }
+
+        #获取赠品信息
+        $order_gifts = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->where('gift_id','>',0)->lists('gift_id');
+        $order_m_gifts = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 0)->lists('id');
+        $order_b_gifts = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->lists('id');
+
+        #查询用户会员信息
+        $cust_info = array();
+        $cust_info['coupons'] = 0;
+        $cust_info['if_m_gift'] = 0;
+        $cust_info['if_b_gift'] = 0;
+
+        $phone = $order['buyer_phone'];
+        $time = date('Y-m-d H:i:s');
+        $customer_info = DB::table('customer_vip')->where('phone', $phone)->where('is_del', 0)->first();
+        if(!empty($customer_info) && $order['create_time']>'2019-11-28'){
+            //判断是否过期
+            if($customer_info->vip_end_time > $time){
+                //未过期，1.获取优惠券，获取当月礼，获取生日礼，判断领取
+                $coupons = DB::table('customer_coupons')->where('phone', $phone)->where('is_use', 0)->where('end_time', '>', $time)->first();
+                $cust_info['coupons'] = !empty($coupons) ? 1:0;
+                //判断是否领取当月礼
+                $if_m_gift = DB::table('customer_gift_receives')->where('phone', $phone)->where('is_del',0)->where('gift_type', 0)->where('dtime', '>=', $mtime)->first();
+                if(empty($if_m_gift)){
+                    $cust_info['if_m_gift'] = 1;
+                }
+                          
+                //判断生日礼
+                $birth_stime = date('m-d', strtotime($customer_info->birthday.' -3 day'));               
+                $birth_etime = date('m-d', strtotime($customer_info->birthday.' +3 day'));      
+                $today = date('m-d'); 
+                if($today>=$birth_stime && $today<=$birth_etime){
+                    //生日期内，判断是否已领
+                    $if_b_gift = DB::table('customer_gift_receives')->where('phone', $phone)->where('is_del',0)->where('gift_type', 1)->where('dtime', '>=', $mtime)->first();
+                    if(empty($if_b_gift)){
+                        $cust_info['if_b_gift'] = 1;
+                    }
+                }
+
+            }
+
+        }
+
         return view('order/orderedit', [       
             'order' => $order,
             //'categorylist' => $catelist,
@@ -792,6 +945,11 @@ class OrderController extends Controller
             'str_query'=> 'page='.$page.'&admin_id='.$admin_id.'&stime='.$stime.'&etime='.$etime.'&receiverName='.$receiverName.'&receiverMobile='.$receiverMobile,
             'last_url' => $last_url,
             'deposit_phone' => $deposit_phone,
+            'm_gift' => $m_gift,
+            'b_gift' => $b_gift,
+            'order_m_gifts' => $order_m_gifts,
+            'order_b_gifts' => $order_b_gifts,
+            'cust_info' => $cust_info,
         ]);
 
     }
@@ -869,6 +1027,14 @@ class OrderController extends Controller
         //if(!empty($request->input('createTime'))) $order['createTime'] = $request->input('createTime'); // 订单创建时间
         $order['order_status'] = (int)$request->input('order_status');
         $order['payment_type'] = (int)$request->input('payment_type'); //支付方式
+        $order['use_coupon'] = (int)$request->input('use_coupon');
+        $order['buyer_phone'] = $request->input('buyer_phone');
+        $order['use_b_gift'] = (int)$request->input('use_b_gift');
+
+        $m_gift_id = (int)$request->input('m_gift_id');
+        if($m_gift_id>0){
+            $order['use_m_gift'] = 1;
+        }
 
         //$order['status'] = (int)$request->input('status');
         $order['should_amount'] = $request->input('should_amount');
@@ -971,7 +1137,7 @@ class OrderController extends Controller
             $gnum = $request->input('gnum');
             if(empty($skus)) $skus = [];
             //先删除
-            $del_re = DB::table('order_goods_skus')->where('order_id', $id)->whereNotIn('sku_id', $skus)->update(['is_del'=>1]);
+            $del_re = DB::table('order_goods_skus')->where('order_id', $id)->whereNull('gift_id')->whereNotIn('sku_id', $skus)->update(['is_del'=>1]);
             if(!empty($skus)){            
                 //再同步
                 foreach($skus as $k=>$sku_id){
@@ -1076,6 +1242,100 @@ class OrderController extends Controller
                 Oplog::addLog($self_id, $self_name, $context, $type, $tables, $data_id);
             }  
 
+            #新加逻辑，使用优惠券，赠礼
+            $use_coupon = (int)$request->input('use_coupon');
+            $use_b_gift = (int)$request->input('use_b_gift');
+
+            if($use_coupon == 1 && $old_order->use_coupon != 1){
+                $coupon = DB::table('customer_coupons')->where('phone', $order['buyer_phone'])->where('is_use',0)->orderBy('id', 'desc')->first();
+                if(!empty($coupon)){
+                    $cup = array();
+                    $cup['is_use'] = 1;
+                    $cup['use_time'] = date('Y-m-d H:i:s');
+                    $cup['order_id'] = $id;
+                    DB::table('customer_coupons')->where('id', $coupon->id)->update($cup);
+                }
+            }elseif($use_coupon == 0 && $old_order->use_coupon == 1){
+                DB::table('customer_coupons')->where('order_id', $id)->update(['is_use'=>0]);
+            }
+             #查询本单使用赠礼
+            $order_gifts = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->where('gift_id','>',0)->lists('gift_id');
+            $order_m_gift_id = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 0)->pluck('id');
+            $order_b_gift_ids = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->lists('id');
+
+            if($m_gift_id>0 && empty($order_m_gift_id) ){
+                $m_gift = DB::table('customer_month_gift')->where('id', $m_gift_id)->where('type', 0)->first();
+                $order_m_gift = array();
+                $m_sku = GoodsSkus::where('id', $m_gift->sku_id)->first();
+                $order_m_gift['sku_id'] = $m_gift->sku_id;
+                $order_m_gift['order_id'] = $id;
+                $order_m_gift['goods_id'] = $m_sku->goodsCode;
+                $order_m_gift['num'] = $m_gift->num;
+                $order_m_gift['price'] = $m_sku->price;
+                $order_m_gift['gift_id'] = $m_gift_id;
+                $order_gift_insert = DB::table('order_goods_skus')->insert($order_m_gift);
+                #记录领取
+                $receive_gift = array();
+                $receive_gift['phone'] = $order['buyer_phone'];
+                $receive_gift['dtime'] = date('Y-m-d');
+                $receive_gift['order_id'] = $id;
+                $receive_gift['gift_id'] = $m_gift_id;
+                $receive_gift['gift_type'] = 0;
+                DB::table('customer_gift_receives')->insert($receive_gift);
+            }elseif($m_gift_id>0 && $m_gift_id != $order_m_gift_id){
+                DB::table('order_goods_skus')->where('gift_id', $order_m_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
+                DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_m_gift_id)->update(['is_del'=>1]);
+
+                $m_gift = DB::table('customer_month_gift')->where('id', $m_gift_id)->where('type', 0)->first();
+                $order_m_gift = array();
+                $m_sku = GoodsSkus::where('id', $m_gift->sku_id)->first();
+                $order_m_gift['sku_id'] = $m_gift->sku_id;
+                $order_m_gift['order_id'] = $id;
+                $order_m_gift['goods_id'] = $m_sku->goodsCode;
+                $order_m_gift['num'] = $m_gift->num;
+                $order_m_gift['price'] = $m_sku->price;
+                $order_m_gift['gift_id'] = $m_gift_id;
+                $order_gift_insert = DB::table('order_goods_skus')->insert($order_m_gift);
+                #记录领取
+                $receive_gift = array();
+                $receive_gift['phone'] = $order['buyer_phone'];
+                $receive_gift['dtime'] = date('Y-m-d');
+                $receive_gift['order_id'] = $id;
+                $receive_gift['gift_id'] = $m_gift_id;
+                $receive_gift['gift_type'] = 0;
+                DB::table('customer_gift_receives')->insert($receive_gift);
+            }elseif($m_gift_id==0 && $order_m_gift_id>0){
+                DB::table('order_goods_skus')->where('gift_id', $order_m_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
+                DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_m_gift_id)->update(['is_del'=>1]);
+            }
+
+            $mdate = date('Y-m-01', strtotime($old_order->create_time));
+            if($use_b_gift>0 && empty($order_b_gift_ids) ){
+                $b_gifts = DB::table('customer_month_gift')->where('mtime', $mdate)->where('type', 1)->get();
+                $b_gifts = json_decode(json_encode($b_gifts),true);
+                foreach($b_gifts as $b_gift){
+                    $order_b_gift = array();
+                    $b_sku = GoodsSkus::where('id', $b_gift['sku_id'])->first();
+                    $order_b_gift['sku_id'] = $b_gift['sku_id'];
+                    $order_b_gift['order_id'] = $id;
+                    $order_b_gift['goods_id'] = $b_sku->goodsCode;
+                    $order_b_gift['num'] = $b_gift['num'];
+                    $order_b_gift['price'] = $b_sku->price;
+                    $order_b_gift['gift_id'] = $b_gift['id'];
+                    $order_gift_insert = DB::table('order_goods_skus')->insert($order_b_gift);
+                }
+                #记录领取
+                $receive_gift = array();
+                $receive_gift['phone'] = $order['buyer_phone'];
+                $receive_gift['dtime'] = date('Y-m-d');
+                $receive_gift['order_id'] = $id;
+                $receive_gift['gift_type'] = 1;
+                DB::table('customer_gift_receives')->insert($receive_gift);
+            }elseif($use_b_gift==0 && !empty($order_b_gift_ids)){
+                DB::table('order_goods_skus')->whereIn('gift_id', $order_b_gift_ids)->where('order_id', $id)->update(['is_del'=>1]);
+                DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_type', 1)->update(['is_del'=>1]);
+            }
+
             DB::commit();
         }catch (Exception $e){
             DB::rollback();
@@ -1125,11 +1385,31 @@ class OrderController extends Controller
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
 
+
                 #更新order_goods_skus状态
                 $mj_status = array();
                 $mj_status['mj_status'] = 2;
                 OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
 
+                //假如删除订单使用了优惠券，礼品
+                if($order->use_coupon == 1){
+                    DB::table('customer_coupons')->where('order_id', $id)->update(['is_use'=>0]);
+                }
+                 #查询本单使用赠礼
+                $order_gifts = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->where('gift_id','>',0)->lists('gift_id');
+                if(!empty($order_gifts)){
+                    $order_m_gift_id = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 0)->pluck('id');
+                    $order_b_gift_ids = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->lists('id');
+                    if($order_m_gift_id>0){
+                        DB::table('order_goods_skus')->where('gift_id', $order_m_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
+                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_m_gift_id)->update(['is_del'=>1]);
+                    }
+                    if(!empty($order_b_gift_ids)){
+                        DB::table('order_goods_skus')->whereIn('gift_id', $order_b_gift_ids)->where('order_id', $id)->update(['is_del'=>1]);
+                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_type', 1)->update(['is_del'=>1]);
+                    }
+                }
+
                 #记录操作日志
                 $self_id = session('admin_id');
                 $self_name = session('real_name');            
@@ -1197,10 +1477,30 @@ class OrderController extends Controller
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
 
+
                 #更新order_goods_skus状态,退回库存
                 $mj_status = array();
                 $mj_status['mj_status'] = 2;
                 OrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
+
+                //假如删除订单使用了优惠券，礼品
+                if($order->use_coupon == 1){
+                    DB::table('customer_coupons')->where('order_id', $id)->update(['is_use'=>0]);
+                }
+                 #查询本单使用赠礼
+                $order_gifts = DB::table('order_goods_skus')->where('is_del', 0)->where('order_id', $id)->where('gift_id','>',0)->lists('gift_id');
+                if(!empty($order_gifts)){
+                    $order_m_gift_id = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 0)->pluck('id');
+                    $order_b_gift_ids = DB::table('customer_month_gift')->whereIn('id', $order_gifts)->where('type', 1)->lists('id');
+                    if($order_m_gift_id>0){
+                        DB::table('order_goods_skus')->where('gift_id', $order_m_gift_id)->where('order_id', $id)->update(['is_del'=>1]);
+                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_id', $order_m_gift_id)->update(['is_del'=>1]);
+                    }
+                    if(!empty($order_b_gift_ids)){
+                        DB::table('order_goods_skus')->whereIn('gift_id', $order_b_gift_ids)->where('order_id', $id)->update(['is_del'=>1]);
+                        DB::table('customer_gift_receives')->where('order_id', $id)->where('gift_type', 1)->update(['is_del'=>1]);
+                    }
+                }
                 
                 #记录操作日志
                 $self_id = session('admin_id');
@@ -1955,5 +2255,47 @@ class OrderController extends Controller
         return $mjOrder['order'];
     }
 
+    /**
+     * 获取手机号会员信息
+     */
+    public function getVip(Request $request){
+        $phone = $request->input('phone');
+        $time = date('Y-m-d H:i:s');
+        $customer_info = DB::table('customer_vip')->where('phone', $phone)->where('is_del', 0)->first();
+        if(!empty($customer_info)){
+            //判断是否过期
+            if($customer_info->vip_end_time > $time){
+                //未过期，1.获取优惠券，获取当月礼，获取生日礼，判断领取
+                $coupons = DB::table('customer_coupons')->where('phone', $phone)->where('is_use', 0)->where('end_time', '>', $time)->first();
+                $customer_info->coupons = !empty($coupons) ? 1:0;
+                //判断是否领取当月礼
+                $mtime = date('Y-m-01');
+                $if_m_gift = DB::table('customer_gift_receives')->where('phone', $phone)->where('is_del',0)->where('gift_type', 0)->where('dtime', '>=', $mtime)->first();
+                $customer_info->if_m_gift = 0;
+                if(empty($if_m_gift)){
+                    $customer_info->if_m_gift = 1;
+                }
+                          
+                //判断生日礼
+                $birth_stime = date('m-d', strtotime($customer_info->birthday.' -3 day'));               
+                $birth_etime = date('m-d', strtotime($customer_info->birthday.' +3 day'));      
+                $today = date('m-d'); 
+                $customer_info->if_b_gift = 0;
+                if($today>=$birth_stime && $today<=$birth_etime){
+                    //生日期内，判断是否已领
+                    $if_b_gift = DB::table('customer_gift_receives')->where('phone', $phone)->where('is_del',0)->where('gift_type', 1)->where('dtime', '>=', $mtime)->first();
+                    if(empty($if_b_gift)){
+                        $customer_info->if_b_gift = 1;
+                    }
+                }
+
+                exit(json_encode(['code'=>0, 'data'=>$customer_info]));
+            }
+            exit(json_encode(['code'=>1,'msg'=>'会员过期']));
+        }
+
+        exit(json_encode(['code'=>1,'msg'=>'不是会员']));
+    }
+
 }
 

app/Http/Controllers/Api/GoodsController.php

@@ -1,6 +1,7 @@
 <?php namespace App\Http\Controllers\Api;
 
 use App\Goods;
+use App\GoodsSkus;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 
@@ -8,19 +9,37 @@ class GoodsController extends Controller {
 
 	public function index()
 	{
-        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh', 'gs.quantity', 'gs.is_white','goods.picUrl','goods.goodsCategoryName')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
+        $result = Goods::select('id as goods_id', 'name','picUrl','goodsCategoryName')->where('is_del', 0)->orderBy('goods.id', 'desc')->get();
         $result = json_decode(json_encode($result), true);
 
         $data = array();
         foreach($result as $value){
-            if($value['is_white'] == 0 && $value['quantity'] <= 0){
-                $value['stock'] = 0;
+            # 获取sku
+            $skuList = GoodsSkus::select('id as sku_id','propsName','price','is_white','quantity','is_weigh')->where('goodsCode', $value['goods_id'])->where('is_del', 0)->get();
+            $skuList = json_decode(json_encode($skuList),true);
+            $sku = array();
+            foreach($skuList as $v){
+                if($v['is_white'] == 0 && $v['quantity'] <= 0){
+                    $v['stock'] = 0;
+                } else {
+                    $v['stock'] = 1;
+                }
+                unset($v['is_white']);
+                unset($v['quantity']);
+                $sku[] = $v;
+            }
+            $value['sku_num'] = count($sku);
+            if(1 == $value['sku_num']){
+                $value['stock'] = $sku[0]['stock'];
+                $value['is_weigh'] = $sku[0]['is_weigh'];
+            }
+            $value['sku_list'] = $sku;
+
+            if('0' == $value['goodsCategoryName']) {
+                $data['其它'][] = $value;
             } else {
-                $value['stock'] = 1;
+                $data[$value['goodsCategoryName']][] = $value;
             }
-            unset($value['is_white']);
-            unset($value['quantity']);
-            $data[$value['goodsCategoryName']][] = $value;
         }
 
         return self::returnValue($data,200);
@@ -29,17 +48,31 @@ class GoodsController extends Controller {
 	public function searchGoods(Request $request)
     {
         $name = trim($request->input('name'));
-        $result = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName', 'gs.price', 'gs.is_weigh', 'gs.quantity', 'gs.is_white','goods.picUrl')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->where('goods.name', 'like', '%'.$name.'%')->where('goods.is_del', 0)->where('gs.is_del', 0)->orderBy('goods.id', 'desc')->get();
+        $result = Goods::select('id as goods_id', 'name','picUrl','goodsCategoryName')->where('name', 'like', '%'.$name.'%')->where('is_del', 0)->orderBy('id', 'desc')->get();
         $result = json_decode(json_encode($result), true);
         $data = array();
-        foreach ($result as $value) {
-            if($value['is_white'] == 0 && $value['quantity'] <= 0){
-                $value['stock'] = 0;
-            } else {
-                $value['stock'] = 1;
+        foreach($result as $value){
+            # 获取sku
+            $skuList = GoodsSkus::select('id as sku_id','propsName','price','is_white','quantity','is_weigh')->where('goodsCode', $value['goods_id'])->where('is_del', 0)->get();
+            $skuList = json_decode(json_encode($skuList),true);
+            $sku = array();
+            foreach($skuList as $v){
+                if($v['is_white'] == 0 && $v['quantity'] <= 0){
+                    $v['stock'] = 0;
+                } else {
+                    $v['stock'] = 1;
+                }
+                unset($v['is_white']);
+                unset($v['quantity']);
+                $sku[] = $v;
+            }
+            $value['sku_num'] = count($sku);
+            if(1 == $value['sku_num']){
+                $value['stock'] = $sku[0]['stock'];
+                $value['is_weigh'] = $sku[0]['is_weigh'];
             }
-            unset($value['is_white']);
-            unset($value['quantity']);
+            $value['sku_list'] = $sku;
+
             $data[] = $value;
         }
 

app/Http/Controllers/Api/LoginController.php

@@ -36,9 +36,12 @@ class LoginController extends Controller
         }
 
         if($res = Hash::check($password, $admin->password)){
-            return self::returnValue(['admin_id'=>$admin->id],200);
+            #角色
+            $role = AdminRole::where('user_id', '=', $admin->id)->first();
+            return self::returnValue(['admin_id'=>$admin->id,'role'=>$role->role_name],200);
         }else{
             return self::returnValue('密码错误',2002);
         }
+
     }
-}
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -17,4 +17,8 @@ class VerifyCsrfToken extends BaseVerifier {
 		return parent::handle($request, $next);
 	}
 
+	protected $except = [
+	    'api/*'
+    ];
+
 }

app/Http/routes.php

@@ -88,6 +88,7 @@ Route::group(['prefix' => 'admin'], function(){
         Route::post('/order/setrefundinfo', 'Admin\OrderController@set_refund');  //设为退货 用于c仓同步到卖家取消订单，不删除单子
         Route::get('/order/setverify/{id}', 'Admin\OrderController@setverify');  //设为已审核
         Route::get('/order/setverifymore', 'Admin\OrderController@setverifymore');  //设为已审核
+        Route::get('/order/getVip', 'Admin\OrderController@getVip');  //获取会员信息
 
         //分销订单管理
         Route::get('/fxorder/index', 'Admin\FxOrderController@orderindex');
@@ -297,9 +298,24 @@ Route::group(['prefix' => 'admin'], function(){
         //编辑充值方式
         Route::get('deposit/editPayType', 'Admin\CustomerDepositController@editPayType');
 
-        //用户订单统计
+        //用户盈利模型
         Route::get('statistics/customerOrder','Admin\StatisticsController@customerOrder');
 
+        //会员录入管理
+        Route::get('customer/vipList','Admin\CustomerDepositController@vipCustomerList');
+        Route::get('customer/vipCreate','Admin\CustomerDepositController@addVipCustomer');
+        Route::get('customer/vipUpdate','Admin\CustomerDepositController@editVipCustomer');
+        Route::post('customer/addVip','Admin\CustomerDepositController@storeVipCustomer');
+        Route::post('customer/editVip','Admin\CustomerDepositController@updateVipCustomer');
+        Route::get('customer/vipUp','Admin\CustomerDepositController@vipUp');
+        Route::get('customer/vipDel','Admin\CustomerDepositController@vipDel');
+
+        //会员礼品管理
+        Route::get('customer/giftList','Admin\CustomerDepositController@monthGiftList');
+        Route::get('customer/giftAdd','Admin\CustomerDepositController@addMonthGift');
+        Route::get('customer/giftEdit','Admin\CustomerDepositController@editMonthGift');
+        Route::post('customer/giftStore','Admin\CustomerDepositController@monthGiftStore');
+        Route::post('customer/giftUpdate','Admin\CustomerDepositController@monthGiftUpdate');
     });
     
 });
@@ -310,10 +326,6 @@ Route::group(['prefix' => 'api'], function() {
     Route::get('/template/qrcode', 'Api\TemplateController@salerQrcode');
     Route::get('/template/addLongLog', 'Api\TemplateController@addLongLog');
     Route::get('/dayGrandTotal', 'Api\TemplateController@dayGrandTotal');
-
-});
-
-Route::group(['prefix' => 'api'], function(){
     #h5登录
     Route::post('/login','Api\LoginController@doLogin');
 
@@ -321,4 +333,11 @@ Route::group(['prefix' => 'api'], function(){
     Route::get('/goodsList','Api\GoodsController@index');
     #添加商品-商品搜索
     Route::post('/searchGoods','Api\GoodsController@searchGoods');
+
+    Route::get('/order/orderList', 'Api\OrderController@orderList');
+    Route::post('/order/orderstore', 'Api\OrderController@orderstore');
+    Route::post('/order/orderupdate', 'Api\OrderController@orderupdate');
+    Route::get('/order/getAddress', 'Api\OrderController@getAddress');
+    Route::get('/order/getBalance', 'Api\OrderController@getBalance');
+    Route::post('/order/setverify', 'Api\OrderController@setverify');
 });

app/Oplog.php

@@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
 class Oplog extends Model
 {
     public $timestamps = false;
-    protected $table = "Oplog";
+    protected $table = "oplog";
  
  	/**
  	 * 记录操作

resources/views/admin/index.blade.php

@@ -1,4 +1,3 @@
-
 @extends('admin/master')
 @section('content')
     <header class="navbar-wrapper">
@@ -27,6 +26,7 @@
                         <li @if(!isset($res['admin/all'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/admin/all')}}" data-title="用户列表" href="javascript:void(0)">用户列表</a></li>
                         <li @if(!isset($res['admin/teamSalers'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/admin/teamSalers')}}" data-title="团队用户列表" href="javascript:void(0)">团队用户列表</a></li>
                         <li @if(!isset($res['admin/all'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/admin/teamindex')}}" data-title="团队列表" href="javascript:void(0)">团队列表</a></li>
+                        <li @if(!isset($res['customer/monthGift'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/customer/giftList')}}" data-title="会员赠礼管理" href="javascript:void(0)">会员赠礼管理</a></li>
                     </ul>
                 </dd>
             </dl>
@@ -74,7 +74,8 @@
                         <li @if(!isset($res['custreport/total'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/custreport/totalindex')}}" data-title="运营上报投放数据" href="javascript:void(0)">运营上报投放数据</a></li>
                         <li @if(!isset($res['custreport/detail'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/custreport/detailindex')}}" data-title="销售上报加粉数据" href="javascript:void(0)">销售上报加粉数据</a></li>
                         <li @if(!isset($res['custreport/disCostList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/custreport/disCostList')}}" data-title="上报地域投入数据" href="javascript:void(0)">上报地域投入数据</a></li>
-                        <li @if(!isset($res['admin/qrcode'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/admin/uploadQrcodeEdit')}}" data-title="微信二维码上传" href="javascript:void(0)">微信二维码上传</a></li>                        
+                        <li @if(!isset($res['admin/qrcode'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/admin/uploadQrcodeEdit')}}" data-title="微信二维码上传" href="javascript:void(0)">微信二维码上传</a></li>
+                        <li @if(!isset($res['customer/vipList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/customer/vipList')}}" data-title="会员用户录入" href="javascript:void(0)">会员用户录入</a></li>
                     </ul>
                 </dd>
             </dl>

resources/views/customer/customerGiftList.blade.php

@@ -0,0 +1,98 @@
+@extends('admin/master')
+@section('content')
+    <body>
+    @if(session('info'))
+        <div class="Huialert Huialert-info" onclick="$(this).remove()" id="info">
+            {{session('info')}}
+        </div>
+    @endif
+    <div class="page-container">
+        <div>
+            <input class="input-text" style="width:5%;text-align:center" type="text" value="赠礼类型"/>
+            <select style="width:6%;text-align:center" id='type' name="type" class="select-box">
+                <option value="-1" @if($type=='-1') selected @endif>-- 请选择--</option>
+                <option value="1" @if($type==1) selected @endif>生日赠礼</option>
+                <option value="0" @if($type==0) selected @endif>12月赠礼</option>
+            </select>
+            <a class="btn btn-primary radius" onclick="gift_search()" href="javascript:;">搜索</a>
+            <a class="btn btn-primary radius" onclick="gift_add('新增')" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 添加礼品</a>
+        </div>
+        <div class="mt-20">
+            <table class="table table-border table-bordered table-bg table-hover table-sort">
+                <thead>
+                <tr class="text-c">
+                    <th width="10%">ID</th>
+                    <th width="10%">商品名称</th>
+                    <th width="10%">商品图片</th>
+                    <th width="10%">商品规格</th>
+                    <th width="10%">商品数量</th>
+                    <th width="10%">类型</th>
+                    <th width="10%">日期</th>
+                    <th width="10%">操作</th>
+                </tr>
+                </thead>
+                <tbody>
+                @if($result)
+                    @foreach($result as $a)
+                        <tr class="text-c">
+                            <td class="text-c">{{$a['id']}}</td>
+                            <td class="text-c">{{$a['goods']['name']}}</td>
+                            <td class="text-c"><img style="width:100px;" src="{{$a['goods']['picUrl']}}"/></td>
+                            <td class="text-c">{{$a['sku']['propsName']}}</td>
+                            <td class="text-c">{{$a['num']}}</td>
+                            <td class="text-c">{{$a['type'] == 0 ? '12月赠礼' : '生日赠礼'}}</td>
+                            <td class="text-c">{{$a['mtime']}}</td>
+                            <td class="f-14 product-brand-manage">
+                                <a style="text-decoration:none" onClick='gift_edit("{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a>
+                            </td>
+                        </tr>
+                    @endforeach
+                @endif
+                </tbody>
+            </table>
+        </div>
+        <div id="page" class="page_div"></div>
+    </div>
+
+    <!--_footer 作为公共模版分离出去-->
+    <script type="text/javascript" src="/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="/admin/lib/layer/2.4/layer.js"></script>
+    <script type="text/javascript" src="/admin/static/h-ui/js/H-ui.min.js"></script>
+    <script type="text/javascript" src="/admin/static/h-ui.admin/js/H-ui.admin.js"></script>
+    <script type="text/javascript" src="/admin/lib/page/paging.js"></script>
+    <!--/_footer 作为公共模版分离出去-->
+    <!--/_footer 作为公共模版分离出去-->
+
+    <script type="text/javascript">
+        $(function(){
+            setTimeout("$('#info').hide()",3000);
+        });
+        /*管理员-添加*/
+        function gift_add(){
+            location.href = '/admin/customer/giftAdd';
+        }
+        /*管理员-编辑*/
+        function gift_edit(id){
+            location.href = "/admin/customer/giftEdit?id="+id;
+        }
+
+        function gift_search(){
+            var type = $('#type').val();
+            location.href='giftList?page='+num+'&type='+type;
+        }
+
+        $("#page").paging({
+            pageNo:{{$page}},
+            totalPage: {{$pages}},
+            totalSize: {{$count}},
+            callback: function(num) {
+                var type = $('#type').val();
+                location.href='giftList?page='+num + '&type='+type;
+            }
+        })
+
+
+    </script>
+    </body>
+
+@endsection

resources/views/customer/vipCustomerCreate.blade.php

@@ -0,0 +1,76 @@
+@extends('admin/master')
+@section('content')
+    <body>
+    @if(count($errors) > 0)
+        <div class="Huialert Huialert-info" id="error">
+            @foreach($errors->all() as $error)
+                <li>{{$error}}</li>
+            @endforeach
+        </div>
+    @endif
+    <div class="page-container">
+        <form action="/admin/customer/addVip" method="post" class="form form-horizontal" enctype="multipart/form-data">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    姓名：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" class="input-text" value="{{old('name')}}" placeholder="" name="name">
+                </div>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    手机号：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" class="input-text" value="{{old('phone')}}" placeholder="" name="phone">
+                    <br>
+                </div>
+            </div>
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    生日：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" autocomplete="off" class="input-text Wdate" name="birthday" value="{{old('birthday')}}">
+                    <br>
+                </div>
+            </div>
+            <div class="row cl">
+                <label for="" class="form-label col-xs-4 col-sm-2">选择销售:</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <select style="text-align:center" id='admin_id' class="select-box" name="admin_id">
+                        <option value="0" selected class="select-option">-- 选择销售 --</option>
+                        @foreach($adminlist as $v)
+                            <option value="{{$v['id']}}" @if(old('admin_id')==$v['id']) selected @endif class="select-option">{{$v['realname']}}</option>
+                        @endforeach
+                    </select>
+                </div>
+            </div>
+            <div class="row cl">
+                <div class="col-9 col-offset-2">
+                    <button class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">&nbsp;&nbsp;提交&nbsp;&nbsp;</button>&nbsp;
+                    <button class="btn btn-default" type="reset" onclick="return_index();">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;
+                    {{--<a href="javascript:void(0)" class="btn btn-default radius" onclick="redirect('{{url('/admin/admin/all')}}')">返回并查看结果</a>--}}
+                </div>
+            </div>
+        </form>
+    </div>
+    <!--_footer 作为公共模版分离出去-->
+    <script type="text/javascript" src="/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="/admin/lib/layer/2.4/layer.js"></script>
+    <script type="text/javascript" src="/admin/static/h-ui/js/H-ui.min.js"></script>
+    <script type="text/javascript" src="/admin/static/h-ui.admin/js/H-ui.admin.js"></script>
+    <!--/_footer 作为公共模版分离出去-->
+
+    <!--请在下方写此页面业务相关的脚本-->
+    <script type="text/javascript" src="/admin/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+    <script type="text/javascript">
+        $(function(){
+            setTimeout("$('#error').hide()",3000);
+        });
+        /*返回*/
+        function return_index(){
+            location.href='/admin/customer/vipList';
+        }
+    </script>
+    </body>
+@endsection

resources/views/customer/vipCustomerEdit.blade.php

@@ -0,0 +1,84 @@
+@extends('admin/master')
+@section('content')
+    <body>
+    @if(count($errors) > 0)
+        <div class="Huialert Huialert-info" id="error">
+            @foreach($errors->all() as $error)
+                <li>{{$error}}</li>
+            @endforeach
+        </div>
+    @endif
+    <style type="text/css">
+        #good_sku{
+            position: absolute;
+            z-index: 9;
+            background: #ffffff;
+            box-shadow: 1px 1px 1px 1px #ccc;
+            width: calc(100% - 30px);
+        }
+        #good_sku li{
+            font-size: 12px;
+            line-height: 24px;
+            cursor: pointer;
+            padding: 5px 10px;
+        }
+        #good_sku li:hover{
+            background: #eaeaea;
+        }
+    </style>
+    <div class="page-container">
+        <form id='order-form' action="/admin/customer/editVip" method="post" class="form form-horizontal" enctype="multipart/form-data">
+            <input type="hidden" name="_token" value="{{ csrf_token() }}" />
+                <input type="hidden" name="id" value="{{$info['id']}}" />
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2">
+                        姓名：</label>
+                    <div class="formControls col-xs-6 col-sm-6">
+                        <input type="text" class="input-text" value="{{$info['name']}}" placeholder="请输入用户姓名" name="name">
+                    </div>
+                </div>
+                <div class="row cl">
+                    <label class="form-label col-xs-4 col-sm-2">
+                        生日：</label>
+                    <div class="formControls col-xs-6 col-sm-6">
+                        <input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" autocomplete="off" class="input-text Wdate" name="birthday" value="{{$info['birthday']}}">
+                    </div>
+                </div>
+            <div class="row cl">
+                <label for="" class="form-label col-xs-4 col-sm-2">选择销售:</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <select style="text-align:center" id='admin_id' class="select-box" name="admin_id">
+                        @foreach($adminlist as $v)
+                            <option value="{{$v['id']}}" @if($info['admin_id'] == $v['id']) selected @endif class="select-option">{{$v['realname']}}</option>
+                        @endforeach
+                    </select>
+                </div>
+            </div>
+            <div class="row cl">
+                <div class="col-9 col-offset-2">
+                    <button class="btn btn-primary radius" type="submit" value="&nbsp;&nbsp;提交&nbsp;&nbsp;">&nbsp;&nbsp;提交&nbsp;&nbsp;</button>&nbsp;
+                    <button class="btn btn-default" type="reset" onclick="return_index();">&nbsp;&nbsp;返回&nbsp;&nbsp;</button>&nbsp;
+                </div>
+            </div>
+        </form>
+    </div>
+    <!--_footer 作为公共模版分离出去-->
+    <script type="text/javascript" src="/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+    <script type="text/javascript" src="/admin/lib/layer/2.4/layer.js"></script>
+    <script type="text/javascript" src="/admin/static/h-ui/js/H-ui.min.js"></script>
+    <script type="text/javascript" src="/admin/static/h-ui.admin/js/H-ui.admin.js"></script>
+    <!--/_footer 作为公共模版分离出去-->
+
+    <!--请在下方写此页面业务相关的脚本-->
+    <script type="text/javascript" src="/admin/lib/My97DatePicker/4.8/WdatePicker.js"></script>
+    <script type="text/javascript">
+        $(function() {
+            setTimeout("$('#error').hide()", 3000);
+        })
+        /*返回*/
+        function return_index(){
+            location.href='/admin/customer/vipList';
+        }
+    </script>
+    </body>
+@endsection

resources/views/customer/vipCustomerList.blade.php

@@ -0,0 +1,152 @@
+@extends('admin/master')
+@section('content')
+<body>
+@if(session('info'))
+<div class="Huialert Huialert-info" onclick="$(this).remove()" id="info">
+    {{session('info')}}
+</div>
+@endif
+<div class="page-container">
+    <div>
+        @if($self_role != '销售')
+            <input class="input-text" style="width:6%;text-align:center" type="text" value="所属团队"/>
+            <select style="width:10%;text-align:center" class="select-box" id='team_id' name="team_id">
+                <option value="0" @if($team_id=='') selected @endif class="select-option">-- 选择团队 --</option>
+                @foreach($teamlist as $v)
+                    <option value="{{$v['id']}}" @if($team_id==$v['id']) selected @endif class="select-option">{{$v['name']}}</option>
+                @endforeach
+            </select>
+            <input class="input-text" style="width:6%;text-align:center" type="text" value="所属销售"/>
+            <select style="width:8%;text-align:center" id='admin_id' class="select-box" name="admin_id">
+                <option value="0" @if($admin_id=='') selected @endif class="select-option">-- 选择销售 --</option>
+                @foreach($adminlist as $v)
+                    <option value="{{$v['id']}}" @if($admin_id==$v['id']) selected @endif class="select-option">{{$v['realname']}}</option>
+                @endforeach
+            </select>
+        @endif
+        <input class="input-text" style="width:6%;text-align:center" type="text" value="客户名"/>
+        <input id="name" type="text"  class="input-text" style="width:10%;text-align:center" name="name" value="{{$name?$name:''}}">
+        <input class="input-text" style="width:6%;text-align:center" type="text" value="手机号"/>
+        <input id="phone" type="text"  class="input-text" style="width:10%;text-align:center" name="phone" value="{{$phone?$phone:''}}">
+        <a class="btn btn-primary radius" onclick="user_search()" href="javascript:;">搜索</a>
+        <a class="btn btn-primary radius" onclick="user_add('新增')" href="javascript:;"><i class="Hui-iconfont">&#xe600;</i> 新增vip用户</a>
+    </div>
+    <div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+            <thead>
+            <tr class="text-c">
+                <th width="10%">姓名</th>
+                <th width="10%">手机号</th>
+                <th width="10%">到期时间</th>
+                <th width="10%">生日</th>
+                <th width="10%">状态</th>
+                <th width="10%">操作</th>
+            </tr>
+            </thead>
+            <tbody>
+            @if($result)
+            @foreach($result as $a)
+            <tr class="text-c">
+                <td class="text-c">{{$a['name']}}</td>
+                <td class="text-c">{{$a['phone']}}</td>
+                <td class="text-c">{{$a['vip_end_time']}}</td>
+                <td class="text-c">{{$a['birthday']}}</td>
+                <td class="text-c">{{$a['is_del'] == 0 ? '启用' : '禁用'}}</td>
+                <td class="f-14 product-brand-manage">
+                    <a style="text-decoration:none" onClick='user_edit("{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a>
+                    @if($a['is_del']==0)
+                        <a style="text-decoration:none" class="ml-5" onClick="user_del(this, '{{$a["id"]}}')" href="javascript:;" title="禁用"><span class="btn btn-danger radius">禁用</span></a>
+                    @elseif($a['is_del']==1)
+                        <a style="text-decoration:none" class="ml-5" onClick="user_up(this, '{{$a['id']}}')" href="javascript:;" title="启用"><span class="btn btn-success radius">启用</span></a>
+                    @endif
+                </td>
+            </tr>
+            @endforeach
+            @endif
+            </tbody>
+        </table>
+    </div>
+    <div id="page" class="page_div"></div>
+</div>
+
+<!--_footer 作为公共模版分离出去-->
+<script type="text/javascript" src="/admin/lib/jquery/1.9.1/jquery.min.js"></script>
+<script type="text/javascript" src="/admin/lib/layer/2.4/layer.js"></script>
+<script type="text/javascript" src="/admin/static/h-ui/js/H-ui.min.js"></script>
+<script type="text/javascript" src="/admin/static/h-ui.admin/js/H-ui.admin.js"></script>
+<script type="text/javascript" src="/admin/lib/page/paging.js"></script>
+<!--/_footer 作为公共模版分离出去-->
+<!--/_footer 作为公共模版分离出去-->
+
+<script type="text/javascript">
+    $(function(){
+        setTimeout("$('#info').hide()",3000);
+    });
+    /*管理员-添加*/
+    function user_add(){
+        location.href = '/admin/customer/vipCreate';
+    }
+    /*管理员-编辑*/
+    function user_edit(id){
+        location.href = "/admin/customer/vipUpdate?id="+id;
+    }
+
+    /*vip用户-禁用*/
+    function user_del(obj,id){
+        layer.confirm('确认要禁用吗？',function(index){
+            $.ajax({
+                type: 'GET',
+                url: '/admin/customer/vipDel?id='+id,
+                dataType: 'json',
+                success: function(data){
+                    if(data == 1){
+                        location.reload();
+                    }
+                }
+            });
+        });
+    }
+
+    /*vip用户-启用*/
+    function user_up(obj,id){
+        layer.confirm('确认要启用吗？',function(index){
+            $.ajax({
+                type: 'GET',
+                url: '/admin/customer/vipUp?id='+id,
+                dataType: 'json',
+                success: function(data){
+                    if(data == 1){
+                        location.reload();
+                    }
+                }
+            });
+        });
+    }
+
+
+    function user_search(){
+        var phone = $('#phone').val();
+        var name = $('#name').val();
+        var team_id = $('#team_id').val();
+        var admin_id = $('#admin_id').val();
+        location.href='vipList?page='+num + '&name='+name + '&phone='+phone + '&team_id=' + team_id + '&admin_id=' + admin_id;
+    }
+
+    $("#page").paging({
+        pageNo:{{$page}},
+        totalPage: {{$pages}},
+        totalSize: {{$count}},
+    callback: function(num) {
+        var phone = $('#phone').val();
+        var name = $('#name').val();
+        var team_id = $('#team_id').val();
+        var admin_id = $('#admin_id').val();
+        location.href='vipList?page='+num + '&name='+name + '&phone='+phone+ '&team_id=' + team_id + '&admin_id=' + admin_id;
+    }
+    })
+
+
+</script>
+</body>
+
+@endsection

resources/views/order/ordercreate.blade.php

@@ -40,6 +40,24 @@
                 </div>
             </div>
             
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'>* </font>买家手机号：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" class="input-text" value="{{old('buyer_phone')}}" placeholder="" onkeyup="getVip()" name="buyer_phone">
+                </div>
+            </div>
+
+             <div id='use_coupon_div' class="row cl" style="display: none">
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'>* </font>是否使用优惠券：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="radio" name="use_coupon"  value="0" checked disabled>
+                    <label for="status-0" style="margin-right: 27px;">否</label>
+                    <input id='use_coupon_1' type="radio" name="use_coupon" value="1"  disabled>
+                    <label for="status-1">是</label>
+                </div>
+            </div>
             
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
@@ -177,7 +195,33 @@
                     
                 </div>
                
-            </div><br>       
+            </div><br>   
+
+            <div id='m_gift_div' class="row cl" style="display: none">
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'> </font>选择会员当月赠品</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <span class="select-box">
+                        <select  size="1" name="m_gift_id" id='m_gift'>                           
+                            <option value="0" @if(old('m_gift_id')=='0') selected @endif>- 请选择 -</option>
+                            @foreach($m_gift as $item)
+                                <option value="{{$item['id']}}" @if(old('m_gift_id')==$item['id']) selected @endif>{{$item['goods_name']}}【{{$item['propsName']}} ￥{{$item['price']}}】</option>
+                            @endforeach                                        
+                        </select>
+                    </span>
+                </div>
+            </div> 
+
+            <div id='b_gift_div' class="row cl" style="display: none">
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'> </font>是否使用生日赠品</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="radio" name="use_b_gift"  value="0" checked disabled >
+                    <label for="status-0" style="margin-right: 27px;">否</label>
+                    <input id='use_b_gift_1' type="radio" name="use_b_gift" value="1" disabled>
+                    <label for="status-1">是</label>
+                </div>
+            </div>    
 
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
@@ -791,6 +835,12 @@
         var is_ok = 1;
         var payment_type = $("input[type='radio'][name='payment_type']:checked").val();
         if(payment_type==4){
+            //使用充值卡不能使用优惠券验证
+            use_coupon = $("input[type='radio'][name='use_coupon']:checked").val();
+            if(use_coupon == 1){
+                layer.msg('充值卡不能和优惠券同时使用!',{icon:2,time:1500});
+                return false;
+            }
             var phone = $("input[name=deposit_phone]").val();
             if(!phone){
                 is_ok = 0;
@@ -821,6 +871,53 @@
 
      }
 
+     function getVip(){
+            var phone = $('input[name=buyer_phone]').val();
+            var reg = /^1\d{10}$/
+            if(reg.test(phone)){
+                $.ajax({
+                    'url': '/admin/order/getVip?phone='+phone,
+                    'type': 'get',
+                    'dateType': 'json',
+                    success:function(data){
+                        data = eval("("+data+")");
+                        if(data.code==0){
+                            if(data.data.coupons == 1){
+                                $("input[name=use_coupon]").removeAttr('disabled');
+                                $("#use_coupon_1").attr("checked","checked");
+                                $("#use_coupon_div").show();                              
+                            }
+                            if(data.data.if_m_gift == 1){
+                                $("#m_gift").removeAttr('disabled');
+                                $("#m_gift_div").show();
+                            }
+                            if(data.data.if_b_gift == 1){
+                                $("input[name=use_b_gift]").removeAttr('disabled');
+                                $("#use_b_gift_1").attr("checked","checked");
+                                $("#b_gift_div").show();
+                            }
+                        }else{
+                            $("input[name=use_coupon]").attr('disabled','disabled');
+                            $("#m_gift").attr('disabled','disabled');
+                            $("input[name=use_b_gift]").attr('disabled','disabled');
+                            $("#use_coupon_div").hide();
+                            $("#m_gift_div").hide();
+                            $("#b_gift_div").hide();
+                        }
+                       
+                    }
+                })
+            }
+            else{
+                $("input[name=use_coupon]").attr('disabled','disabled');
+                $("#m_gift").attr('disabled','disabled');
+                $("input[name=use_b_gift]").attr('disabled','disabled');
+                $("#use_coupon_div").hide();
+                $("#m_gift_div").hide();
+                $("#b_gift_div").hide();
+            }
+        }
+
     </script>
     </body>
 @endsection

resources/views/order/orderedit.blade.php

@@ -41,6 +41,25 @@
                 </div>
             </div>
             
+            <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'>* </font>买家手机号：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    {{$order['buyer_phone']}}
+                    <input type="hidden" class="input-text" value="{{$order['buyer_phone']}}" placeholder="" name="buyer_phone">
+                </div>
+            </div>
+
+             <div id='use_coupon_div' class="row cl" @if($order['use_coupon'] !='1' && $cust_info['coupons'] != '1') style="display: none" @endif>
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'>* </font>是否使用优惠券：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="radio" name="use_coupon"  value="0"  @if($order['use_coupon']=='0') checked @endif>
+                    <label for="status-0" style="margin-right: 27px;">否</label>
+                    <input type="radio" name="use_coupon" value="1" @if($order['use_coupon']=='1') checked @endif>
+                    <label for="status-1">是</label>
+                </div>
+            </div>
             
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
@@ -203,6 +222,32 @@
                 
             </div><br>
 
+            <div id='m_gift_div' class="row cl" @if(empty($order_m_gifts) && $cust_info['if_m_gift'] != '1') style="display: none" @endif>
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'> </font>选择会员当月赠品</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <span class="select-box">
+                        <select  size="1" name="m_gift_id" id='m_gift'>                           
+                            <option value="0" @if(old('m_gift_id')=='0') selected @endif>- 请选择 -</option>
+                            @foreach($m_gift as $item)
+                                <option value="{{$item['id']}}" @if( in_array($item['id'], $order_m_gifts) ) selected @endif>{{$item['goods_name']}}【{{$item['propsName']}} ￥{{$item['price']}}】</option>
+                            @endforeach                                        
+                        </select>
+                    </span>
+                </div>
+            </div> 
+
+            <div id='b_gift_div' class="row cl"   @if(empty($order_b_gifts) && $cust_info['if_b_gift'] != '1') style="display: none" @endif>
+                <label class="form-label col-xs-4 col-sm-2">
+                    <font color='red'> </font>是否使用生日赠品</label>
+                    <div class="formControls col-xs-6 col-sm-6">
+                        <input type="radio" name="use_b_gift"  value="0"  @if($order['use_b_gift']=='0') checked @endif>
+                        <label for="status-0" style="margin-right: 27px;">否</label>
+                        <input type="radio" name="use_b_gift" value="1" @if($order['use_b_gift']=='1') checked @endif>
+                        <label for="status-1">是</label>
+                    </div>
+            </div> 
+
             <div class="row cl">
                 <label class="form-label col-xs-4 col-sm-2">
                    应收金额：</label>
@@ -687,6 +732,13 @@
         var receivedAmount = $("input[name=receivedAmount]").val();
         var payment_type = $("input[type='radio'][name='payment_type']:checked").val();
 
+        if( payment_type==4 ){
+            use_coupon = $("input[type='radio'][name='use_coupon']:checked").val();
+            if(use_coupon == 1){
+                layer.msg('充值卡不能和优惠券同时使用!',{icon:2,time:1500});
+                return false;
+            }
+        } 
 
         if( payment_type==4 && old_payment_type != 4 ){
             var phone = $("input[name=deposit_phone]").val();