Merge branch 'wx-kw' into feature-wechat

# Conflicts:
#	modules/WechatPlatform/routes/route.php

modules/User/Models/Traits/UserRelations.php

@@ -106,7 +106,6 @@ trait UserRelations
                 $actions->add(strtolower(CatchAdmin::getModuleControllerNamespace($permission->module).$controller.'Controller@'.$action));
             }
         });
-
         if ($permission) {
             [$module, $controller, $action] = explode('@', $permission);
 

modules/WechatPlatform/Http/Controllers/CommonController.php

@@ -10,12 +10,22 @@
 namespace Modules\WechatPlatform\Http\Controllers;
 
 use Catch\Base\CatchController;
+use Catch\Exceptions\FailedException;
+use Illuminate\Support\Facades\DB;
+use Modules\WechatPlatform\Http\Requests\PlayPageUrlRequest;
+use Modules\WechatPlatform\Services\WechatCommonService;
 
 class CommonController extends CatchController
 {
 
-    public function getPageUrl()
+    public function getPlayPageUrl(PlayPageUrlRequest $request)
     {
-
+        $sequence = $request->input('sequence');
+        $videoId = $request->input('video_id');
+        $sequenceId = DB::table('video_series')->where('video_id',$videoId)->where('series_sequence',$sequence)->where('is_enabled',1)->value('id');
+        if(empty($sequenceId)){
+            throw  new  FailedException("所选剧集不存在");
+        }
+        return WechatCommonService::getPlayPageUrl($videoId,$sequence);
     }
 }

modules/WechatPlatform/Http/Controllers/SettingController.php

@@ -1,17 +0,0 @@
-<?php
-/**
- *
- * @file:settingController.php
- * @Date: 2023/7/6
- * @Time: 10:58
- */
-
-
-namespace Modules\WechatPlatform\Http\Controllers;
-
-use Catch\Base\CatchController;
-
-class SettingController extends CatchController
-{
-
-}

modules/WechatPlatform/Http/Controllers/WechatKeywordsController.php

@@ -167,4 +167,28 @@ class WechatKeywordsController extends CatchController
         return WechatKeywordsService::WechaAccountAuthListInfo($id,$userId);
     }
 
+    public function getConfig($miniprogramId)
+    {
+
+        $userContext = $this->getUserContext(null);
+        $userId  = $userContext['loginUser']->id;
+        $puserId  = $userContext['loginUser']->pid;
+        return WechatKeywordsService:: getConfig($userId,$puserId,$miniprogramId);
+    }
+
+    public function setConfig($miniprogramId,Request $request)
+    {
+        if (!$request->has('value') ){
+            throw  new FailedExceptio("参数错误");
+        }
+        $param = $request->all(['value']);
+        if (!in_array($param['value'],[0,1]) ){
+            throw  new FailedExceptio("参数错误");
+        }
+        $userContext = $this->getUserContext(null);
+        $param['miniprogram_id'] = $miniprogramId;
+        $param['user_id'] = $userContext['loginUser']->id;
+        $param['puser_id'] = $userContext['loginUser']->pid;
+        return WechatKeywordsService::setConfig($param);
+    }
 }

modules/WechatPlatform/Http/Requests/PlayPageUrlRequest.php

@@ -10,9 +10,53 @@
 namespace Modules\WechatPlatform\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\DB;
 
 class PlayPageUrlRequest extends FormRequest
 {
-    
+    /**
+     * rules
+     *
+     * @return array
+     */
+    public function rules(): array
+    {
+        return [
+            'video_id' => [
+                'required',
+                'Integer',
+                "gt:0",
+                function ($attribute, $value, $fail) {
+                    $has = DB::table('videos')->where('id', $value)->first();
+                    if (empty($has)) {
+                        $fail("短剧不不正确");
+                        exit();
+                    }
+                    if ($has->shelf_type != 2){
+                        $fail("短剧未上架");
+                    }
+                }
+            ],
+            'sequence' => [
+                'required',
+                'Integer',
+                "gt:0"
+            ],
+        ];
+    }
+
+    /**
+     * messages
+     *
+     * @return string[]
+     */
+    public function messages(): array
+    {
+        return [
+            'video_id.required' => '请选择短剧',
+            'sequence.required' => '请选择剧集',
+            'sequence' => '剧集不正确',
+        ];
+    }
 
 }

modules/WechatPlatform/Models/MiniprogramWechatGlobalConfig.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Modules\WechatPlatform\Models;
+
+use Modules\Common\Models\BaseModel;
+
+
+class MiniprogramWechatGlobalConfig extends BaseModel
+{
+    protected $table = 'miniprogram_wechat_global_config';
+
+    protected $fillable = [
+        'id', 'user_id', 'puser_id', 'miniprogram_id', 'type', 'value', 'desc', 'updated_at', 'created_at',
+    ];
+}

modules/WechatPlatform/Models/WechatAccountKeywordLog.php

@@ -10,7 +10,7 @@ class WechatAccountKeywordLog extends BaseModel
     protected $table = 'wechat_account_keyword_log';
 
     protected $fillable = [
-        'id', 'weacht_keyworld_id', 'appid',"wechat_authorization_info_id", 'nick_name', 'keyword', 'content', 'status', 'send_total', 'updated_at', 'created_at',
+        'id','user_id', 'puser_id',  'weacht_keyworld_id',"miniprogram_id", 'appid',"wechat_authorization_info_id", 'nick_name', 'keyword', 'content', 'status', 'send_total', 'updated_at', 'created_at',
     ];
 
 }

modules/WechatPlatform/Services/WechatCommonService.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ *
+ * @file:WechatCommonSevice.php
+ * @Date: 2023/7/7
+ * @Time: 11:44
+ */
+
+
+namespace Modules\WechatPlatform\Services;
+
+use Modules\Common\Services\BaseService;
+
+class WechatCommonService extends BaseService
+{
+
+
+    /**
+     *  播放页面地址
+     * name: getPlayPageUrl
+     * @param $videoId
+     * @param $sequence
+     * date 2023/07/07 11:52
+     */
+    public static function getPlayPageUrl($videoId,$sequence)
+    {
+        return ['url' =>  "/pages/video/index?video_id={$videoId}&sequence={$sequence}"];
+    }
+}

modules/WechatPlatform/Services/WechatKeywordsService.php

@@ -11,6 +11,7 @@ namespace Modules\WechatPlatform\Services;
 
 use Illuminate\Support\Facades\DB;
 use Modules\Common\Services\BaseService;
+use Modules\WechatPlatform\Models\MiniprogramWechatGlobalConfig;
 use Modules\WechatPlatform\Models\WechatAccountKeywordLog;
 use Modules\WechatPlatform\Models\WechatKeywords;
 
@@ -18,6 +19,7 @@ class WechatKeywordsService extends BaseService
 {
 
     protected static array $hideField = ['updated_at', 'is_del', 'del_at', 'user_id', 'puser_id', 'send_content']; // 公用的影藏字段
+    const KEYWORD_SET_KEY = "miniprogram_wechat_keyword";
 
     /**
      *  添加关键字
@@ -96,30 +98,15 @@ class WechatKeywordsService extends BaseService
         if (is_empty($info)) {
             self::throwErrMsg('关键词不存在或已删除');
         }
+        $appIds = [];
         if ($param['keyword'] != $info->keyword) {
             // 修改关键词，需要查询词关键词是否已配置
-            if ($info->wechat_accounts) {
-                $appIds = WechatAccountKeywordLog::where('weacht_keyworld_id', $info->id)->where('status', 1)->pluck('appid')->get();
-                if ($appIds) {
-                    $hasUsed = WechatAccountKeywordLog::where('keyword', $param['keyword'])->whereIn('appid', $appIds)->where('status', 1)->pluck('nick_name')->get();
-                    if ($hasUsed) {
-                        self::throwErrMsg("关键字{$param['keyword']}已配置了以下公众号" . implode(',', $hasUsed) . "请先解绑后再编辑");
-                    }
-                }
-            }
+            $appIds = WechatAccountKeywordLog::where('weacht_keyworld_id', $info->id)->where('status', 1)->pluck('wechat_authorization_info_id')->toArray();
         }
-        DB::beginTransaction();
-        try {
-            $info->save($param);
-            $data = [
-                'content' => $param['send_content'],
-                'keyword' => $param['keyword'],
-            ];
-            WechatAccountKeywordLog::where('weacht_keyworld_id', $info->id)->update($data);
-            DB::commit();
-        } catch (\Exception $exception) {
-            DB::rollBack();
-            self::throwErrMsg('编辑失败');
+        $info->save($param);
+        if ($appIds){
+            WechatAccountKeywordLog::where('weacht_keyworld_id',$info->id)->update(['status' => 0]);
+            self::allocation($info->id,$appIds);
         }
         return "操作成功";
     }
@@ -184,6 +171,7 @@ class WechatKeywordsService extends BaseService
         }
         $data = [];
         $list = [];
+        $errMsg = "";
         if (empty($wxAuthIds)){
             $data['wechat_accounts'] = [];
         }else{
@@ -201,6 +189,9 @@ class WechatKeywordsService extends BaseService
             if (count($canNotUsed) > 0){
                 self::throwErrMsg("优化师对id:为：".implode(',',$canNotUsed)."的公众号没有使用权限");
             }
+            $keywords = explode(',',$info->keyword);
+
+            $allSet =   WechatAccountKeywordLog::where('user_id',$info->user_id)->get();
 
             foreach ($wechatAccountInfos as  $val){
                 $data['wechat_accounts'][] = [
@@ -209,34 +200,65 @@ class WechatKeywordsService extends BaseService
                     'nick_name' => $val->nick_name,
                     'component_appid' => $val->component_appid
                 ];
-                $list[] = [
-                    'weacht_keyworld_id' => $info->id,
-                    'appid' => $val->authorizer_appid,
-                    'wechat_authorization_info_id'=> $val->id,
-                    'nick_name' => $val->nick_name,'keyword' => $info->keyword,
-                    'content' => $info->send_content,
-                    'status' => 1,
-                ];
+                foreach ($keywords as  $kval){
+                    $has  = $allSet->where( 'keyword',$kval)
+                        ->where( 'wechat_authorization_info_id', $val->id)
+                    ->where( 'status', 1)
+                        ->where('weacht_keyworld_id','<>',$info->id)->first();
+                    if ($has){
+                        $errMsg .=  "{$val->nick_name}已重新配置关键词{$kval};";
+                    }
+                    $list[] = [
+                        'weacht_keyworld_id' => $info->id,
+                        'user_id' => $info->user_id,
+                        'puser_id' => $info->puser_id,
+                        'miniprogram_id' =>  $info->miniprogram_id,
+                        'appid' => $val->authorizer_appid,
+                        'wechat_authorization_info_id'=> $val->id,
+                        'nick_name' => $val->nick_name,
+                        'keyword' => $kval,
+                        'content' => $info->send_content,
+                        'status' => 1,
+                    ];
+                }
             }
         }
-
+        unset($wechatAccountInfos,$allSet);
         DB::beginTransaction();
         try {
+            WechatAccountKeywordLog::where('weacht_keyworld_id',$id)->update(['status' => 0]);
             if (!empty($list)){
+                WechatAccountKeywordLog::where('user_id',$info->user_id)
+                    ->whereIn("keyword",$keywords)->whereIn('wechat_authorization_info_id',$wxAuthIds)->update(['status' => 0]);
                 foreach ($list as $val){
-                    WechatAccountKeywordLog::updateOrCreate(['weacht_keyworld_id' => $val['weacht_keyworld_id'],'wechat_authorization_info_id' => $val['wechat_authorization_info_id']],$val);
+                    WechatAccountKeywordLog::updateOrCreate(['weacht_keyworld_id' => $val['weacht_keyworld_id'],'keyword' => $val['keyword'],'wechat_authorization_info_id' => $val['wechat_authorization_info_id']],$val);
                 }
-            }else{
-                WechatAccountKeywordLog::where('weacht_keyworld_id',$id)->update(['status' => 0]);
             }
             WechatKeywords::where('id',$id)->update($data);
             DB::commit();
         }catch (\Exception $exception){
-            DB::rollBack();
             self::throwErrMsg('操作失败');
         }
-        return "操作成功";
+        return "操作成功".$errMsg;
     }
 
+    public static function getConfig($userId, $puserId, $miniprogramId)
+    {
+        $set = MiniprogramWechatGlobalConfig::where(['user_id' =>  $userId,'puser_id' =>  $puserId,'miniprogram_id' =>  $miniprogramId])
+                ->where('type',self::KEYWORD_SET_KEY)->value('value');
+        return $set == 1 ? 1 :0;
+    }
 
+    public static function setConfig($param)
+    {
+        $param['type'] = self::KEYWORD_SET_KEY;
+        $res = MiniprogramWechatGlobalConfig::updateOrCreate(
+            ['user_id' =>  $param['user_id'],'puser_id' => $param['puser_id'],'miniprogram_id' =>  $param['miniprogram_id'],'type' => self::KEYWORD_SET_KEY],
+            $param
+        );
+        if($res){
+            return "操作成功";
+        }
+        return "操作失败";
+    }
 }

modules/WechatPlatform/routes/route.php

@@ -17,35 +17,38 @@ Route::prefix('wechatPlatform')->group(function(){
         Route::post('updateGZH', [KFMessageController::class, 'updateGZH']);
     });
 
+    // 关键字列表
+    Route::prefix('keyword')->group(function () {
+        // 获取关键词设置
+        Route::any('getConfig/{miniprogramId}',[WechatKeywordsController::class,'getConfig'])->withoutMiddleware(config('catch.route.middlewares'));
+        // 关键词全局设置
+        Route::post('setConfig/{miniprogramId}',[WechatKeywordsController::class,'setConfig'])->withoutMiddleware(config('catch.route.middlewares'));
+        // 列表
+        Route::any("list",[WechatKeywordsController::class,'list']);
+        // 添加
+        Route::post('add',[WechatKeywordsController::class,'add']);
+        // 编辑
+        Route::post('edit/{id}',[WechatKeywordsController::class,'edit']);
+        // 详情
+        Route::any('detail/{id}',[WechatKeywordsController::class,'detail']);
+        // 删除
+        Route::any('del',[WechatKeywordsController::class,'del']);
+        // 配置公众号
+        Route::post('allocation/{id}',[WechatKeywordsController::class,'allocation']);
+        // 关键字公账号配置选择项
+        Route::any("auth_list/{id}",[WechatKeywordsController::class,'authList']);
+    });
+
 
     // 微信公众号设置
     Route::prefix('officialAccount')->group(function () {
         //公众号列表
         Route::get("list",[WechatAuthorizationInfoController::class,'index']);
-
-        // 关键字列表
-        Route::prefix('keyword')->group(function () {
-            // 列表
-            Route::any("list",[WechatKeywordsController::class,'list']);
-            // 添加
-            Route::post('add',[WechatKeywordsController::class,'add']);
-            // 编辑
-            Route::post('edit/{id}',[WechatKeywordsController::class,'edit']);
-            // 详情
-            Route::any('detail/{id}',[WechatKeywordsController::class,'detail']);
-            // 删除
-            Route::any('del',[WechatKeywordsController::class,'del']);
-            // 配置公众号
-            Route::post('allocation/{id}',[WechatKeywordsController::class,'allocation']);
-
-            // 关键字公账号配置选择项
-            Route::any("auth_list/{id}",[WechatKeywordsController::class,'authList']);
-        });
-    });    
+    });
     // 公共部分
     Route::prefix('common')->group(function (){
         // 获取小程序页面链接
-        Route::post('get_page',[CommonController::class,'getPageUrl'])->withoutMiddleware(config('catch.route.middlewares'));
+        Route::post('get_play_url',[CommonController::class,'getPlayPageUrl'])->withoutMiddleware(config('catch.route.middlewares'));
     });
 
     // 设置