card

app/Http/Controllers/Admin/Card/InfoController.php

@@ -10,6 +10,7 @@ namespace App\Http\Controllers\Admin\Card;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\CardInfoModel;
 use App\Models\ProductCategoryModel;
+use App\Models\ProductInfoModel;
 use App\Models\SettingInfoModel;
 use EasyWeChat\Factory;
 use Illuminate\Http\Request;
@@ -35,7 +36,7 @@ class InfoController extends Controller
             $query = $query->pushCriteria(new OrderBy('status','ASC'));
         }
         $list = $query->paginate(10);
-        $product = ProductCategoryModel::all();
+        $product = ProductInfoModel::all();
         return view('admin.card.info.index',compact('list','product'));
     }
 
@@ -73,6 +74,7 @@ class InfoController extends Controller
     private function _updateSave() {
         $post = (array) request('data');
         $data['remark'] = $post['remark'];
+        $data['used_at'] = $post['used_at'];
         $data['status'] = 2;
         $ok = $this->repository->update(request('id'),$data);
         if($ok) {

app/Http/Controllers/Api/V1/HomeController.php

@@ -23,7 +23,8 @@ use function foo\func;
 use Illuminate\Http\Request;
 use App\Services\Base\Attachment;
 use App\Services\Base\ErrorCode;
-use Validator, Response, Auth, Cache;
+use Illuminate\Support\Facades\Cache;
+use Validator, Response, Auth;
 
 class HomeController extends Controller
 {
@@ -777,7 +778,6 @@ class HomeController extends Controller
             ]
         );
 
-
         if ($validator->fails()) {
             return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '传入参数不正确!', $validator->messages());
         }
@@ -808,6 +808,8 @@ class HomeController extends Controller
 
         if (request('couponid')) {
             $coupon = CouponInfoModel::find(request('couponid'));
+            Cache::store('database')->put($order->out_trade_no, request('couponid'), 10);
+
             if ($coupon->type == 1) {
                 $money = $money * ($coupon->discount / 10);
             } else {
@@ -816,9 +818,38 @@ class HomeController extends Controller
 
         }
         if (request('cardid')) {
-            $discount = CardInfoModel::find(request('cardid'))->price;
-            $money = $money - $discount;
+            $money = 0;
         }
+
+        if($money == 0){
+            $order->status = 1;
+            $order->save();
+
+            if(request('cardid')){
+
+            }
+
+            $data['order_no'] = $order->out_trade_no;
+            $data['order_id'] = $order->id;
+            $data['order_price'] = $order->price;
+            $data['paid_price'] = 0;
+            $data['type'] = $order->paytype;
+
+            PaidInfoModel::create($data);
+
+            $data = [
+                'code' => 200,
+                'msg'  => '支付成功'
+            ];
+
+            $card = CardInfoModel::find(request('cardid'));
+            $card->status =2;
+            $card->save();
+
+            return $this->api(compact('data'));
+
+        }
+
         $app = Factory::payment($this->options());
 
         $result = $app->order->unify([
@@ -867,6 +898,14 @@ class HomeController extends Controller
 
                 PaidInfoModel::create($data);
 
+                $couponid = Cache::store('database')->get($order->out_trade_no);
+                if($couponid) {
+                    $user_id = $order->user_id;
+                    $coupon = UserCouponRelationModel::where('coupon_id',$couponid)->where('user_id',$user_id)->first();
+                    $coupon->status =1;
+                    $coupon->save();
+                }
+
 
             } else {
                 return $successful('通信失败，请稍后再通知我');
@@ -1131,7 +1170,7 @@ class HomeController extends Controller
         if (!$coupon) {
             $data = [
                 'code' => 10002,
-                'msg' => '改优惠券已被领取完毕！'
+                'msg' => '该优惠券已被领取完毕！'
             ];
             return $this->api($data);
         }
@@ -1148,7 +1187,7 @@ class HomeController extends Controller
         } else {
             $data = [
                 'code' => 10002,
-                'msg' => '改优惠券已被领取完毕！'
+                'msg' => '该优惠券已被领取完毕！'
             ];
 
             return $this->api($data);
@@ -1294,8 +1333,6 @@ class HomeController extends Controller
      *              {
      *                  "id": 7,
      *                  "card_no": "15319090241",
-     *                  "price": 50,
-     *                  "min_price": 100,
      *                  "status": 1,
      *                  "user_id": 1,
      *                  "remark": "",
@@ -1376,16 +1413,12 @@ class HomeController extends Controller
         $usablecoupons = array_values($usablecoupons);
 
 
-        $current_product = ProductInfoModel::find(request('product_id'));
-        $usableCards = CardInfoModel::where('user_id', $user->id)->where('status', 1)->where('end_time', '>=', now())->where('product_id', 'like', '%' . request('product_id') . '%')->where('min_price','<=',$current_product->origin_price)->get();
+        $usableCards = CardInfoModel::where('user_id', $user->id)->where('status', 1)->where('end_time', '>=', now())->where('product_id', 'like', '%' . request('product_id') . '%')->get();
         foreach ($usableCards as $card) {
             $card->product = $card->product();
         }
 
-
         return $this->api(compact('usablecoupons', 'usableCards'));
-
-
     }
 
     /**

app/Models/CardInfoModel.php

@@ -37,14 +37,13 @@ class CardInfoModel extends BaseModel
      */
     protected $fillable = [
         'card_no',
-        'price',
         'status',
         'user_id',
         'remark',
         'end_time',
         'product_id',
-        'min_price',
-        'qrcode'
+        'qrcode',
+        'used_at'
     ];
 
     public function status(){
@@ -63,7 +62,7 @@ class CardInfoModel extends BaseModel
     }
 
     public function product(){
-        $product = (new ProductCategoryModel())->whereIn('id',explode(',',$this->product_id))->pluck('name');;
+        $product = (new ProductInfoModel())->whereIn('id',explode(',',$this->product_id))->pluck('name');;
         return $product;
     }
 

app/Models/CouponInfoModel.php

@@ -45,7 +45,7 @@ class CouponInfoModel extends BaseModel
     ];
 
     public function product(){
-        $product = (new ProductCategoryModel())->whereIn('id',explode(',',$this->product_id))->pluck('name');;
+        $product = (new ProductInfoModel())->whereIn('id',explode(',',$this->product_id))->pluck('name');;
         return $product;
     }
 

database/migrations/2018_09_18_100612_add_used_at_card_info.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddUsedAtCardInfo extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('card_info', function (Blueprint $table) {
+            $table->dropColumn(['price','min_price']);
+            $table->timestamp('used_at')->after('end_time')->nullable()->comment('核销时间');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('card_info', function (Blueprint $table) {
+            //
+        });
+    }
+}

resources/views/admin/auth/login.blade.php

@@ -19,7 +19,7 @@
         <div>
             <div>
                 <div>
-                    <h1 class="logo-name">A+</h1>
+                    <h1 class="logo-name" style="font-size: 50px; letter-spacing: 5px; margin: 50px 0">小相馆</h1>
                 </div>
                 <h3>管理后台</h3>
             </div>

resources/views/admin/card/info/edit.blade.php

@@ -34,8 +34,6 @@
                         <div class="col-lg-10">
                             <form name="form_product" id="form-validation" action=""
                                   class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
-
-
                                 <div class="form-group">
 
                                     <label class="control-label col-sm-3">优惠卡编号</label>
@@ -61,6 +59,20 @@
 
                                 </div>
 
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">有限期</label>
+
+                                    <div class="col-sm-9">
+
+                                        <input class="form-control layer-date" id="data_used_at"
+                                               name="data[used_at]" placeholder="YYYY-MM-DD hh:mm:ss"
+                                               onclick="laydate({istime: true, format: 'YYYY-MM-DD hh:mm:ss'})"
+                                               value="{{ $data['used_at'] or ''}}" required="" aria-required="true">
+                                    </div>
+
+                                </div>
+
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">&nbsp;</label>
                                     <div class="col-sm-9">

resources/views/admin/card/info/index.blade.php

@@ -38,12 +38,11 @@
                         <tr>
                             <th class="sorting" data-sort="card_no"> 优惠卡编号</th>
                             <th class="sorting" data-sort="qrcode"> 二维码</th>
-                            <th class="sorting" data-sort="price"> 金额</th>
-                            <th class="sorting" data-sort="min_price">最低使用价格</th>
                             <th class="sorting" data-sort="end_time">有效期</th>
                             <th class="sorting" data-sort="status"> 状态</th>
                             <th class="sorting" data-sort="remark"> 备注</th>
                             <th class="sorting" data-sort="created_at"> 创建时间</th>
+                            <th class="sorting" data-sort="used_at"> 核销时间</th>
                             <th width="22%">相关操作</th>
                         </tr>
                         </thead>
@@ -53,18 +52,13 @@
                                 <tr>
                                     <td>{{ $item->card_no }}</td>
                                     <td><img src="{{$item->qrcode}}" style="height: 80px" alt=""></td>
-                                    <td>{{ $item->price }}</td>
-                                    <td>{{ $item->min_price }}</td>
                                     <td>{{ $item->end_time }}</td>
                                     <td>{{ $item->status() }}</td>
                                     <td>{{ $item->remark }}</td>
                                     <td>{{ $item->created_at }}</td>
+                                    <td>{{ $item->used_at}}</td>
                                     <td>
                                         <div class="btn-group">
-
-
-
-
                                                 @if(role('Card/Info/update') && $item->status <2 )
                                                     <button onclick="window.location.href='{{ U('Card/Info/update',['id'=>$item->id])}}'"
                                                             class="btn btn-warning">核销
@@ -126,33 +120,11 @@
                                                        placeholder="">
                                             </div>
 
-                                        </div>
-                                        <div class="form-group" id="data_discount_price">
-
-                                            <label class="control-label col-sm-3">优惠金额</label>
-
-                                            <div class="col-sm-9">
-                                                <input name="data[price]" class="form-control"
-                                                       value="{{ $data['price'] or ''}}" placeholder="">
-                                            </div>
-
-                                        </div>
-                                        <div class="form-group">
-
-                                            <label class="control-label col-sm-3">最低使用价格</label>
-
-                                            <div class="col-sm-9">
-                                                <input id="data_min_price" name="data[min_price]" class="form-control"
-                                                       value="{{ $data['min_price'] or ''}}" required=""
-                                                       aria-required="true"
-                                                       placeholder="">
-                                            </div>
-
                                         </div>
 
                                         <div class="form-group">
 
-                                            <label class="control-label col-sm-3">可用产品</label>
+                                            <label class="control-label col-sm-3">可抵扣产品</label>
                                             <div class="col-md-6">
                                                 <select name="product_id[]" multiple="multiple" id="product-select"
                                                         class="form-control">

resources/views/admin/card/info/view.blade.php

@@ -1,81 +1,68 @@
 @extends('admin.layout')
 
 @section('content')
-<div class="row">
-    <div class="ibox-content">
-        <div class="list-group">
-                                 
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">ID</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['id'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">优惠卡编号</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['card_no'] or ''}}</p>
-                                                 
-               </div>
-            <div class="list-group-item">
-
-                <h3 class="list-group-item-heading">二维码</h3>
-
-                <p class="list-group-item-text"><img src="{{ $data['qrcode'] }}" style="height: 200px" alt=""></p>
+    <div class="row">
+        <div class="ibox-content">
+            <div class="list-group">
 
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">ID</h3>
+
+                    <p class="list-group-item-text"> {{ $data['id'] or ''}}</p>
+
+                </div>
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">优惠卡编号</h3>
+
+                    <p class="list-group-item-text"> {{ $data['card_no'] or ''}}</p>
+
+                </div>
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">二维码</h3>
+
+                    <p class="list-group-item-text"><img src="{{ $data['qrcode'] }}" style="height: 200px" alt=""></p>
+
+                </div>
+
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">用户ID</h3>
+
+                    <p class="list-group-item-text"> {{ $data['user_id'] or ''}}</p>
+
+                </div>
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">备注</h3>
+
+                    <p class="list-group-item-text"> {{ $data['remark'] or ''}}</p>
+
+                </div>
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading"></h3>
+
+                    <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
+
+                </div>
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">创建时间</h3>
+
+                    <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
+
+                </div>
+                <div class="list-group-item">
+
+                    <h3 class="list-group-item-heading">更新时间</h3>
+
+                    <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
+
+                </div>
             </div>
-            <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">金额</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['price'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">0:未激活；1：已激活，未使用；2：已使用</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['status'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">用户ID</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['user_id'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">备注</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['remark'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading"></h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['deleted_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">创建时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['created_at'] or ''}}</p>
-                                                 
-               </div>                     
-               <div class="list-group-item">
-                                                  
-                   <h3 class="list-group-item-heading">更新时间</h3>
-                                                   
-                   <p class="list-group-item-text"> {{ $data['updated_at'] or ''}}</p>
-                                                 
-               </div>
         </div>
     </div>
-</div>
 @endsection