zilong 4 anni fa
parent
commit
f6f53d3213

+ 3 - 0
app/Http/Controllers/Api/V1/UserController.php

xqd xqd
@@ -11,6 +11,7 @@ namespace App\Http\Controllers\Api\V1;
 use App\Models\Order;
 use App\Models\User;
 use App\Models\UserBalanceLog;
+use App\Models\UserCoupon;
 use EasyWeChat\Factory;
 
 class UserController extends AuthController
@@ -21,6 +22,8 @@ class UserController extends AuthController
 
         unset($user['session_key']);
 
+        $user['coupon_num'] = UserCoupon::where('user_id', $user['id'])->where('status', 1)->where('expire_time', '>', time())->count();
+
         return out($user);
     }
 

+ 5 - 0
app/Models/User.php

xqd
@@ -10,6 +10,11 @@ namespace App\Models;
 
 class User extends BaseModel
 {
+    public function getCouponNumAttr($value, $data)
+    {
+        return UserCoupon::where('user_id', $data['id'])->where('status', 1)->where('expire_time', '>', time())->count();
+    }
+
     //通过token获取用户信息
     public static function getUserByToken()
     {

+ 1 - 7
app/Models/UserCoupon.php

xqd
@@ -23,13 +23,7 @@ class UserCoupon extends BaseModel
             exit_out(null, 10003, '该优惠券已过期');
         }
         if ($userCoupon['status'] == 1) {
-            if ($userCoupon['expire_type'] == 1) {
-                $expire_time = strtotime($userCoupon['created_at']) + $userCoupon['effective_days']*24*3600;
-            }
-            else {
-                $expire_time = $userCoupon['end_time'];
-            }
-            if ($expire_time < time()) {
+            if ($userCoupon['expire_time'] < time()) {
                 self::where('id', $id)->update(['status' => 3]);
                 exit_out(null, 10004, '该优惠券已过期');
             }