From 38627b303c27c14ca141603def57494cd16c74f2 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Tue, 2 Sep 2025 20:38:53 +0800
Subject: [PATCH] update

---
 .../Controllers/Mobile/OtherController.php    | 20 +++++++++----------
 .../Controllers/Mobile/UserController.php     |  3 +--
 app/Models/Course.php                         |  4 +---
 app/Models/CourseContent.php                  |  4 ++--
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/Mobile/OtherController.php b/app/Http/Controllers/Mobile/OtherController.php
index 4d28589..8a9d741 100755
--- a/app/Http/Controllers/Mobile/OtherController.php
+++ b/app/Http/Controllers/Mobile/OtherController.php
@@ -91,9 +91,7 @@ class OtherController extends CommonController
             return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
         }
         $YuanheRepository = new YuanheRepository();
-        //  $result = $YuanheRepository->search(['keyword' => $all['company_name']]);
-        // todo：上线解开注释
-        $result = "[{\"createBy\":null,\"createDt\":null,\"updateBy\":null,\"updateDt\":null,\"creditCode\":\"91320594MA7F0G9W6A\",\"keyNo\":\"db5ppy5kbsprbbhjbjlarvmvphjhp3mrkv\",\"name\":\"苏州元瞰科技有限公司\",\"operName\":\"刘杰杰\",\"startDate\":\"2021-12-21\",\"status\":\"注销\"},{\"createBy\":null,\"createDt\":null,\"updateBy\":null,\"updateDt\":null,\"creditCode\":\"91310118MA1JMYNK9K\",\"keyNo\":\"ak95iy5s3rhmsasj5kepiijjimh95jl3b5\",\"name\":\"上海元橡瞰行科技有限公司\",\"operName\":\"任杰\",\"startDate\":\"2019-03-19\",\"status\":\"存续\"},{\"createBy\":null,\"createDt\":null,\"updateBy\":null,\"updateDt\":null,\"creditCode\":\"91110108MAERYU4T74\",\"keyNo\":\"fs3ijyphhk59kbhjblbsj35priklbla5vh\",\"name\":\"北京元字瞰科技有限公司\",\"operName\":\"宋明龙\",\"startDate\":\"2025-08-22\",\"status\":\"存续\"},{\"createBy\":null,\"createDt\":null,\"updateBy\":null,\"updateDt\":null,\"creditCode\":\"\",\"keyNo\":\"13ivbylse5l5mjkjar9pbhkm9vpsjiksjl\",\"name\":\"上海瞰元信息科技有限公司\",\"operName\":\"刘勇\",\"startDate\":\"2005-06-30\",\"status\":\"吊销\"},{\"createBy\":null,\"createDt\":null,\"updateBy\":null,\"updateDt\":null,\"creditCode\":\"91330100796660273A\",\"keyNo\":\"f3aaeyiss99ev5hjbipkv9eaerkih99bbs\",\"name\":\"杭州瞰元信息科技有限公司\",\"operName\":\"曾铁农\",\"startDate\":\"2006-12-22\",\"status\":\"吊销\"}]";
+        $result = $YuanheRepository->search(['keyword' => $all['company_name']]);
         $result = json_decode($result, true);
         if (!$result) {
             return $this->fail([ResponseCode::ERROR_PARAMETER, '获取失败']);
@@ -156,14 +154,14 @@ class OtherController extends CommonController
             ->whereHas('users', function ($query) {
                 $query->where('is_schoolmate', 1);
             })->with([
-                    'users' => function ($query) {
-                        $query->select('id', 'name', 'username', 'company_position', 'company_id')->where('is_schoolmate', 1)->with([
-                            'courseSigns' => function ($query) {
-                                $query->select('id', 'status', 'user_id', 'course_id')->with('course')->orderBy('fee_status', 'desc');
-                            }
-                        ]);
-                    }
-                ]);
+                'users' => function ($query) {
+                    $query->select('id', 'name', 'username', 'company_position', 'company_id')->where('is_schoolmate', 1)->with([
+                        'courseSigns' => function ($query) {
+                            $query->select('id', 'status', 'user_id', 'course_id')->with('course')->orderBy('fee_status', 'desc');
+                        }
+                    ]);
+                }
+            ]);
         // 根据排序字段进行排序
         if ($sortName !== 'distance') {
             $query->orderBy($sortName, $sortType);
diff --git a/app/Http/Controllers/Mobile/UserController.php b/app/Http/Controllers/Mobile/UserController.php
index 96353cb..54b3677 100755
--- a/app/Http/Controllers/Mobile/UserController.php
+++ b/app/Http/Controllers/Mobile/UserController.php
@@ -244,8 +244,7 @@ class UserController extends CommonController
                 $query->where('start_date', '<=', $nowDate)->where('end_date', '>=', $nowDate);
             })->first();
         if ($course_signs) {
-            // todo::上线解开注释
-            //$course_signs->qrcode = $doorRepository->getEmpQrCodeByCourse($course_signs, $out);
+            $course_signs->qrcode = $doorRepository->getEmpQrCodeByCourse($course_signs, $out);
             $course_signs->qrcode = '';
         }
         // 是否有资格进入校友库
diff --git a/app/Models/Course.php b/app/Models/Course.php
index 487fbc3..d9a98c9 100755
--- a/app/Models/Course.php
+++ b/app/Models/Course.php
@@ -249,9 +249,7 @@ class Course extends SoftDeletesModel
         ];
         $app = Factory::miniProgram($config);
         $tmp = $app->app_code->get('packages/sign/course?course_id=' . $courseId, [
-            // todo:: 版本切换
-            // 'env_version' => "release"  //  正式版
-            'env_version' => "trial"  // 体验版
+            'env_version' => "release"  //  正式版
         ]);
         $dir = dirname($path);
         $fileSys->ensureDirectoryExists($dir, 0755, true);
diff --git a/app/Models/CourseContent.php b/app/Models/CourseContent.php
index 64b83d6..812d2ad 100755
--- a/app/Models/CourseContent.php
+++ b/app/Models/CourseContent.php
@@ -88,8 +88,8 @@ class CourseContent extends SoftDeletesModel
         ];
         $app = Factory::miniProgram($config);
         $tmp = $app->app_code->get('/packages/sign/index?course_content_id=' . $courseContentId, [
-            // 'env_version' => "release"  //  正式版
-            'env_version' => "trial"  // 体验版
+            'env_version' => "release"  //  正式版
+            //'env_version' => "trial"  // 体验版
         ]);
         $dir = dirname($path);
         $fileSys->ensureDirectoryExists($dir, 0755, true);