Merge branch 'quickapp_fly' of iqiyoo:zhuishuyun_wap into quickapp_fly

app/Http/Controllers/QuickApp/Book/ChapterController.php

@@ -20,6 +20,8 @@ use App\Modules\Subscribe\Services\YearOrderService;
 use App\Modules\OfficialAccount\Services\ForceSubscribeService;
 use App\Modules\Subscribe\Services\ChapterReminderService;
 use App\Modules\User\Services\UserDeepReadTagService;
+use App\Modules\UserTask\Services\BaseTask;
+use App\Modules\UserTask\Services\UserTaskService;
 
 class ChapterController extends BaseController
 {
@@ -321,7 +323,7 @@ class ChapterController extends BaseController
         }
         //付费 不提醒
         if ($this->balancePay($book_info, $cid, $chapter->size, $chapter->name, 0)) {
-
+            UserTaskService::addUserTaskQueue($this->uid, BaseTask::read, UserTaskService::judge_trigger);
             ReadRecordService::addReadRecord([
                 'uid' => $this->uid, 'bid' => $bid, 'book_name' => $book_info->book_name,
                 'cid' => $cid, 'chapter_name' => $chapter->name
@@ -596,18 +598,18 @@ class ChapterController extends BaseController
         return   ceil($chapter_size / 100);
     }*/
 
-    private function getPrice($book_info, $chapter_size=0)
+    private function getPrice($book_info, $chapter_size = 0)
     {
         if ($book_info->charge_type == 'BOOK') {
-            if(BookOrderService::isHasBookOrder($this->uid)){
+            if (BookOrderService::isHasBookOrder($this->uid)) {
                 $this->is_first_book_order = 0;
                 return 1399;
-            }else{
+            } else {
                 $this->is_first_book_order = 1;
                 return  899;
             }
         } else {
-            $fee = BookService::getPrice($book_info,$this->distribution_channel_id,$chapter_size);
+            $fee = BookService::getPrice($book_info, $this->distribution_channel_id, $chapter_size);
             return $fee;
         }
     }
@@ -678,7 +680,8 @@ class ChapterController extends BaseController
     }
 
 
-    private function stats(){
+    private function stats()
+    {
         //阅读器统计
         WapVisitStatService::recordReaderUvAndPv($this->uid, $this->distribution_channel_id);
     }

app/Http/Controllers/QuickApp/User/UserController.php

@@ -177,11 +177,12 @@ class UserController extends BaseController
     {
         $code = $request->post('code');
         $phone = $request->post('phone');
+        $version = $request->post('version', '1.0');
         $old = Redis::get('quser_code:' . $phone);
         if ($old && $old == $code) {
             Redis::del('quser_code:' . $phone);
             if (!$this->phone) {
-                $result = (new QappUserService)->bindPhone($this->uid, $phone);
+                $result = (new QappUserService)->bindPhone($this->uid, $phone, $version);
                 if ($result) {
                     return response()->success();
                 } else {

app/Modules/Trade/Pay/PaySuccessAbstract.php

@@ -6,6 +6,8 @@ use App\Jobs\QappTikTokUserCharge;
 use App\Modules\Book\Models\BookConfig;
 use App\Modules\Subscribe\Models\Order;
 use App\Modules\User\Services\ReadRecordService;
+use App\Modules\UserTask\Services\BaseTask;
+use App\Modules\UserTask\Services\UserTaskService;
 use Exception;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
@@ -77,6 +79,7 @@ abstract class PaySuccessAbstract
 
    protected function addQueue()
    {
+      UserTaskService::addUserTaskQueue($this->order->uid, BaseTask::charge, UserTaskService::judge_trigger);
       $bid = ReadRecordService::getSimpleFirstReadRecord($this->order->uid);
       $book_id = book_hash_encode($bid);
       $book = BookConfig::where('bid', $bid)->select('book_name')->first();

app/Modules/User/Services/QappUserService.php

@@ -8,6 +8,8 @@ use App\Jobs\QappTikTokUser;
 use App\Modules\User\Models\QappPackage;
 use App\Modules\User\Models\QappUser;
 use App\Modules\User\Models\User;
+use App\Modules\UserTask\Services\BaseTask;
+use App\Modules\UserTask\Services\UserTaskService;
 use Exception;
 use Illuminate\Support\Facades\DB;
 use Tymon\JWTAuth\Facades\JWTAuth;
@@ -54,7 +56,7 @@ class QappUserService
      * 绑定手机号
      * 多个账号可以绑定一个手机号
      */
-    public function bindPhone(int $uid, string $phone)
+    public function bindPhone(int $uid, string $phone, string $version = "1.0")
     {
         $qapp_user = QappUser::where('uid', $uid)->first();
         if ($qapp_user->phone && $qapp_user->phone != $phone) {
@@ -64,12 +66,16 @@ class QappUserService
                 DB::beginTransaction();
                 if (!$qapp_user->phone) {
                     $reward = 100;
-                    User::where('id', $uid)->update(
-                        [
-                            'balance' => DB::raw('balance+' . $reward),
-                            'reward_balance' => DB::raw('reward_balance+' . $reward)
-                        ]
-                    );
+                    if ($version == "1.0") {
+                        User::where('id', $uid)->update(
+                            [
+                                'balance' => DB::raw('balance+' . $reward),
+                                'reward_balance' => DB::raw('reward_balance+' . $reward)
+                            ]
+                        );
+                    } else {
+                        UserTaskService::addUserTaskQueue($uid, BaseTask::bind_phone, UserTaskService::add_trigger);
+                    }
                 }
                 $qapp_user->phone = $phone;
                 $qapp_user->save();
@@ -152,6 +158,7 @@ class QappUserService
             DB::commit();
             $job = new QappTikTokUser($user->register_ip, $data['device_no'], $data['mac'], $channel_id, $user->id, $user->created_at, true);
             dispatch($job->onConnection('rabbitmq')->onQueue('qapp_tiktok_user_register_queue'));
+            UserTaskService::addUserTaskQueue($user->id, BaseTask::register, UserTaskService::add_trigger);
             return $qapp_user;
         } catch (Exception $e) {
             myLog('create_user')->error($e->getMessage());

app/Modules/User/Services/UserService.php

@@ -24,6 +24,8 @@ use App\Modules\OfficialAccount\Models\DistributionSelfDefineConfig;
 use App\Modules\Channel\Models\Channel;
 use App\Modules\Trade\Models\Order;
 use App\Modules\User\Models\QappUserAddDestop;
+use App\Modules\UserTask\Services\BaseTask;
+use App\Modules\UserTask\Services\UserTaskService;
 use Redis;
 
 class UserService
@@ -59,6 +61,7 @@ class UserService
         // 加桌统计
         if (!$log && $status === 1) {
             QappAddDeskTopService::incrAddDeskTop($uid, QuickConst::FIELD_ADD_DESKTOP);
+            UserTaskService::addUserTaskQueue($uid, BaseTask::add_desk, UserTaskService::add_trigger);
         }
     }