租户配置-1

app/adminapi/controller/BaseAdminController.php

@@ -16,6 +16,7 @@ declare (strict_types=1);
 
 namespace app\adminapi\controller;
 
+use app\common\enum\AdminTerminalEnum;
 use think\App;
 use app\common\controller\BaseLikeAdminController;
 
@@ -31,6 +32,7 @@ class BaseAdminController extends BaseLikeAdminController
 
     public function initialize()
     {
+        $this->request->source = AdminTerminalEnum::PLATFORM;
         if (isset($this->request->adminInfo) && $this->request->adminInfo) {
             $this->adminInfo = $this->request->adminInfo;
             $this->adminId = $this->request->adminInfo['admin_id'];

app/api/controller/BaseApiController.php

@@ -15,6 +15,7 @@
 namespace app\api\controller;
 
 use app\common\controller\BaseLikeAdminController;
+use app\common\enum\AdminTerminalEnum;
 
 class BaseApiController extends BaseLikeAdminController
 {
@@ -23,6 +24,7 @@ class BaseApiController extends BaseLikeAdminController
 
     public function initialize()
     {
+        $this->request->source = AdminTerminalEnum::USER;
         if (isset($this->request->userInfo) && $this->request->userInfo) {
             $this->userInfo = $this->request->userInfo;
             $this->userId = $this->request->userInfo['user_id'];

app/common/enum/AdminTerminalEnum.php

@@ -16,6 +16,7 @@ class AdminTerminalEnum
     const PLATFORM = '__saas__platform__';
     const TENANT = '__saas__tenant__';
     const USER = '__saas__user__';
+    const Worker = '__saas__worker__';
 
     /**
      * @notes 是否为租户端
@@ -49,4 +50,15 @@ class AdminTerminalEnum
     {
         return request()->source === self::USER;
     }
+
+    /**
+     * @notes 是否为工程师端
+     * @return bool
+     * @author JXDN
+     * @date 2024/09/04 16:44
+     */
+    public static function isWorker()
+    {
+        return request()->source === self::Worker;
+    }
 }

app/common/service/ConfigService.php

@@ -43,15 +43,15 @@ class ConfigService
             'value' => $value,
         ];
         $query = ['type' => $type, 'name' => $name];
-        if(!AdminTerminalEnum::isPlatform()) {
+        if(AdminTerminalEnum::isTenant()) {
             $options['tenant_id'] = request()->tenantId;
             $query['tenant_id'] = request()->tenantId;
         }
-        $data = (!AdminTerminalEnum::isPlatform() ? new TenantConfig() : new Config())->where($query)->findOrEmpty();
+        $data = (AdminTerminalEnum::isTenant() ? new TenantConfig() : new Config())->where($query)->findOrEmpty();
 
         if ($data->isEmpty()) {
 
-            (!AdminTerminalEnum::isPlatform() ? new TenantConfig() : new Config())->create($options);
+            (AdminTerminalEnum::isTenant() ? new TenantConfig() : new Config())->create($options);
         } else {
             $data->value = $value;
             $data->save();
@@ -79,9 +79,9 @@ class ConfigService
             $configClass = new Config();
         }else{
             // 根据是否为平台决定查询类
-            $configClass = AdminTerminalEnum::isPlatform() ? new Config() : new TenantConfig();
+            $configClass = !AdminTerminalEnum::isTenant() ? new Config() : new TenantConfig();
             // 判断是否为租户端
-            if (!AdminTerminalEnum::isPlatform()) {
+            if (AdminTerminalEnum::isTenant()) {
                 $query['tenant_id'] = request()->tenantId;
             }
         }

app/common/service/pay/WeChatPayService.php

@@ -89,10 +89,13 @@ class WeChatPayService extends BasePayService
      */
     public function pay($from, $order)
     {
+
         try {
             switch ($this->terminal) {
                 case UserTerminalEnum::WECHAT_MMP:
                     $config = WeChatConfigService::getMnpConfig();
+                    dd($config);
+
                     $result = $this->jsapiPay($from, $order, $config['app_id']);
                     break;
                 case UserTerminalEnum::WECHAT_OA:

app/workerapi/controller/BaseApiController.php

@@ -15,6 +15,7 @@
 namespace app\workerapi\controller;
 
 use app\common\controller\BaseLikeAdminController;
+use app\common\enum\AdminTerminalEnum;
 
 class BaseApiController extends BaseLikeAdminController
 {
@@ -23,6 +24,7 @@ class BaseApiController extends BaseLikeAdminController
 
     public function initialize()
     {
+        $this->request->source = AdminTerminalEnum::Worker;
         if (isset($this->request->userInfo) && $this->request->userInfo) {
             $this->userInfo = $this->request->userInfo;
             $this->userId = $this->request->userInfo['user_id'];