fly 5 lat temu
rodzic
commit
64a20726db

+ 17 - 14
app/Http/Controllers/QuickApp/BaseController.php

@@ -8,22 +8,25 @@ use Illuminate\Routing\Controller;
 class BaseController extends Controller
 {
     private $field = [];
-    
+
     public function __get($name)
     {
-       if (!isset($this->field[$name])) {
-           QappUserService::setGolableUserStatic(162261523);
-           $qapp_user = QappUserService::getGolableUserStatic();
-           if ($name == 'user_info') {
-               $this->field[$name] = $qapp_user->user;
-           }
-           if ($name == 'uid') {
-               $this->field[$name] = $qapp_user->uid;
-           }
-           if ($name == 'distribution_channel_id') {
-               $this->field[$name] = $qapp_user->user->distribution_channel_id;
-           }
-       }
+        if (!isset($this->field[$name])) {
+            QappUserService::setGolableUserStatic(162261523);
+            $qapp_user = QappUserService::getGolableUserStatic();
+            if ($name == 'user_info') {
+                $this->field[$name] = $qapp_user->user;
+            }
+            if ($name == 'uid') {
+                $this->field[$name] = $qapp_user->uid;
+            }
+            if ($name == 'phone') {
+                $this->field[$name] = $qapp_user->phone;
+            }
+            if ($name == 'distribution_channel_id') {
+                $this->field[$name] = $qapp_user->user->distribution_channel_id;
+            }
+        }
         return  $this->field[$name];
     }
 }

+ 3 - 4
app/Http/Controllers/QuickApp/Order/OrdersController.php

@@ -8,7 +8,6 @@ use Illuminate\Http\Request;
 
 use App\Modules\Subscribe\Services\BookOrderService;
 use App\Modules\Subscribe\Services\ChapterOrderService;
-//use App\Modules\Xcx\Services\XcxOrderService as OrderService;
 use App\Modules\Subscribe\Services\OrderService;
 use App\Http\Controllers\QuickApp\Order\Transformers\BookOrderTransformer;
 use App\Http\Controllers\QuickApp\Order\Transformers\ChapterOrderTransformer;
@@ -17,15 +16,12 @@ use App\Libs\Pay\WechatPay;
 use App\Modules\Subscribe\Services\YearOrderService;
 use App\Modules\User\Services\UserService;
 use DB;
-use Redis;
 use Hashids;
 use EasyWeChat\Foundation\Application;
 use App\Modules\Product\Services\ProductService;
 use App\Modules\Book\Services\BookConfigService;
-use App\Modules\Book\Services\BookGiftsService;
 use App\Modules\Book\Services\BookService;
 use App\Modules\Channel\Services\PayTemplateService;
-use App\Modules\User\Services\UserDivisionCpcPropertyService;
 use Log;
 
 class OrdersController extends BaseController
@@ -173,6 +169,7 @@ class OrdersController extends BaseController
                     'is_year_order' => 0,
                     'is_month_order' => 0,
                     'text' => sprintf('%s+%s书币', $v->price * 100, $v->given),
+                    'today_special' => $v->is_default,
                     'first_charge' => true,
                     'save_text' => round($v->given / 100, 1) . '元',
                     'product_id' => $v->id,
@@ -189,6 +186,7 @@ class OrdersController extends BaseController
                     'is_year_order' => 1,
                     'is_month_order' => 0,
                     'text' => $text,
+                    'today_special' => $v->is_default,
                     'first_charge' => false,
                     'save_text' => $save_text,
                     'product_id' => $v->id,
@@ -211,6 +209,7 @@ class OrdersController extends BaseController
                     'is_year_order' => 0,
                     'is_month_order' => 0,
                     'text' => $text,
+                    'today_special' => $v->is_default,
                     'first_charge' => false,
                     'save_text' => $save_text,
                     'product_id' => $v->id,

+ 3 - 0
app/Http/Controllers/QuickApp/User/UserController.php

@@ -34,6 +34,7 @@ class UserController extends BaseController
      * @apiSuccess {String}  balance 书币余额.
      * @apiSuccess {Int}     is_vip 是否vip
      * @apiSuccess {String}  vip_days 364天.
+     * @apiSuccess {String}  phone 手机号.
      * @apiSuccessExample {json} Success-Response:
      *
      *     {
@@ -51,6 +52,7 @@ class UserController extends BaseController
      *             "send_order_id": 323,
      *             "balance": 8956,
      *             "register_time": "2017-12-12 12:12:12",
+     *             "phone": "12312435",
      *         }
      *     }
      */
@@ -62,6 +64,7 @@ class UserController extends BaseController
         }
         $data['is_vip'] = 0;
         $data['vip_days'] = 0;
+        $data['phone'] = $this->phone;
         $year_record = YearOrderService::getRecord($this->uid);
         if ($year_record) {
             $data['is_vip'] = 1;

Plik diff jest za duży
+ 8 - 1
public/kyydoc/api_data.js


Plik diff jest za duży
+ 8 - 1
public/kyydoc/api_data.json


+ 1 - 1
public/kyydoc/api_project.js

@@ -17,7 +17,7 @@ define({
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-10-29T07:46:36.004Z",
+    "time": "2019-10-29T08:38:53.978Z",
     "url": "http://apidocjs.com",
     "version": "0.17.7"
   }

+ 1 - 1
public/kyydoc/api_project.json

@@ -17,7 +17,7 @@
   "apidoc": "0.3.0",
   "generator": {
     "name": "apidoc",
-    "time": "2019-10-29T07:46:36.004Z",
+    "time": "2019-10-29T08:38:53.978Z",
     "url": "http://apidocjs.com",
     "version": "0.17.7"
   }