feat : kitchen

app/Service/Api/Good/OptionalListService.php

@@ -25,6 +25,7 @@ use App\Service\ServiceTrait\Common\OssTrait;
 use Hyperf\Di\Annotation\Inject;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use function Hyperf\Config\config;
 
 class OptionalListService extends BaseService
 {
@@ -66,9 +67,10 @@ class OptionalListService extends BaseService
         if (empty($cycleId)) return $this->return->success('success', ['list' => []]);
 
         $this->goodCache->cycleId = (int)$cycleId;
-        $siteInfo = $this->siteCache->getSiteInfo((int)$this->request->input('site_id'));
-
-        if (empty($siteInfo) || empty($siteInfo['kitchen_id'])) return $this->return->success('success', ['list' => []]);
+        if (!empty($this->request->input('site_id'))){
+            $siteInfo = $this->siteCache->getSiteInfo((int)$this->request->input('site_id'));
+        }
+        if (empty($siteInfo) || empty($siteInfo['kitchen_id'])) $siteInfo['kitchen_id'] = config('system.kitchen_id');
 
         $this->goodCache->kitchenId = (int)$siteInfo['kitchen_id'];
         $data = $this->goodCache->getOptionalGoodList();

config/autoload/system.php

@@ -29,4 +29,6 @@ return [
     'api_url' => env('DEFAULT_API_URL','http://127.0.0.1:9501'),
     // upload_dir
     'upload_dir' => BASE_PATH.'/uploads/',
+    // 默认的厨房 id
+    'default_kitchen_id' => env('DEFAULT_KITCHEN_ID',''),
 ];

env.pre

@@ -6,6 +6,7 @@ JWT_KEY=hhl@shenzhen
 JWT_EXPIRE=2592000
 ADMIN_JWT_EXPIRE=86400
 DEFAULT_API_URL=https://new-api-pre.hehele.cc
+DEFAULT_KITCHEN_ID=1
 
 # [wxLogin]
 WX_APPID=wxc2bc0e47e212d831

env.prod

@@ -6,10 +6,11 @@ JWT_KEY=hch@shenzhen
 JWT_EXPIRE=2592000
 ADMIN_JWT_EXPIRE=86400
 DEFAULT_API_URL=https://hch-api.hehele.cc
+DEFAULT_KITCHEN_ID=1
 
 # [wxLogin]
 WX_APPID=wxc0edbbd0ff0fe7ed
-WX_SECRET=6e4577618df27623152e360899fa802d
+WX_SECRET=2d6f5aa5bfcff36f26b89a26e2b5a1a4
 
 # [crontab] -- 集群配置 仅需一台true即可 其他都是false 根据 restart_pre.sh 自动生成
 CRONTAB_ENABLE=true
@@ -45,7 +46,7 @@ ALI_ACCESS_KEY_ID=LTAI5tFsBsKskcrRmkjpMXay
 ALI_ACCESS_KEY_SECRET=YSIMtOGLu7W8tpQLKdgioTUYmgXB8M
 ALI_BUCKET=hhl-catering
 ALI_REGION=cn-shenzhen
-ALI_CALLBACK_URL=https://new-api-pre.hehele.cc/common/oss/ossCallBack
+ALI_CALLBACK_URL=https://hch-api.hehele.cc/common/oss/ossCallBack
 ALI_OSS_URL=https://hhl-catering.oss-cn-shenzhen.aliyuncs.com/
 ALI_STS_ENDPOINT=sts.cn-shenzhen.aliyuncs.com
 ALI_ROLE_ARN=acs:ram::1644087445786901:role/oss