WIN-2308041133\Administrator 5 ماه پیش
والد
کامیت
224170ffa7
3فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 1 1
      app/common/model/user/GiftLevel.php
  2. 1 1
      app/common/model/user/OilLevel.php
  3. 4 0
      app/controller/api/user/User.php

+ 1 - 1
app/common/model/user/GiftLevel.php

@@ -17,7 +17,7 @@ class GiftLevel extends BaseModel
         return 'gift_level';
     }
 
-//买礼包商品的时候触发
+//买礼包商品的时候触发 检测升级
     public function checkLevel($uid, $pass = [])
     {
         if (in_array($uid, $pass)) return true;

+ 1 - 1
app/common/model/user/OilLevel.php

@@ -16,7 +16,7 @@ class OilLevel extends BaseModel
     {
         return 'oil_level';
     }
-//买节能油商品的时候触发
+//买节能油商品的时候触发 检测升级
     public function checkLevel($uid, $pass = [])
     {
         if (in_array($uid, $pass)) return true;

+ 4 - 0
app/controller/api/user/User.php

@@ -217,8 +217,10 @@ class User extends BaseController
     public function award_range_list(UserBillRepository $billRepository)
     {
         [$page, $limit] = $this->getPage();
+        [$start,$stop]= $this->request->params(['start','stop'],true);
         return app('json')->success($billRepository->userList([
 //            'award_range' => $this->request->param('type', 0),
+        'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
             'status' => 1,
             'category' => 'award_range'
         ], $this->request->uid(), $page, $limit));
@@ -233,8 +235,10 @@ class User extends BaseController
     public function award_integral_list(UserBillRepository $billRepository)
     {
         [$page, $limit] = $this->getPage();
+        [$start,$stop]= $this->request->params(['start','stop'],true);
         return app('json')->success($billRepository->userList([
 //            'award_integral' => $this->request->param('type', 0),
+            'date'=> $start&&$stop ? date('Y/m/d',$start).'-'.date('Y/m/d',$stop) : '',
             'status' => 1,
             'category' => 'award_integral'
         ], $this->request->uid(), $page, $limit));