fix : print text

app/Aspect/Api/ApiReturnAspect.php

@@ -56,10 +56,10 @@ class ApiReturnAspect extends AbstractAspect
         $this->writeResponseLog(json_encode($result));
 
         //正式服加密 测试服不做处理
-        if (SystemUtil::checkProEnv()) {
-            $cryptoFactory = $this->CryptoFactory->cryptoClass('api', json_encode($result['data']));
-            $result['data'] = $cryptoFactory->encrypt();
-        }
+//        if (SystemUtil::checkProEnv()) {
+//            $cryptoFactory = $this->CryptoFactory->cryptoClass('api', json_encode($result['data']));
+//            $result['data'] = $cryptoFactory->encrypt();
+//        }
 
         return $result;
     }

app/Model/AdminUser.php

@@ -117,7 +117,7 @@ class AdminUser extends Model
             ->join('chef', function ($join) use ($ids) {
                 $join->on('chef.user_id', '=', 'admin_user.id')
                     ->whereIn('chef.id', $ids)
-                    ->where('is_del',UserCode::IS_NO_DEL)
+                    ->where('admin_user.is_del',UserCode::IS_NO_DEL)
                     ->select([
                         'admin_user.chinese_name',
                         'chef.id',

app/Service/Admin/Catering/Print/YlyPrintService.php

@@ -126,9 +126,6 @@ class YlyPrintService implements PrintOrderInterface
         //设置宽度
         $this->content .= "<PW>048</PW>";
 
-        $this->content .= "\n";
-        $this->content .= "\n";
-
         //取餐号
         $this->content .= "<FS3><CA>{$this->data['pickup_code']}</CA></FS3>\n";
 
@@ -190,7 +187,7 @@ class YlyPrintService implements PrintOrderInterface
         $contentEdibleTimeTips = config('print.yly.content_edible_time_tips');
         $this->content .= "<LR2>保质期,$contentEdibleTimeTips</LR2>";
 
-        $this->content .= "<FS3><CA>{$this->data['heapsort']}</CA></FS3>";
+        $this->content .= "<FS3><CA>{$this->data['pickup_code']}</CA></FS3>\n";
     }
 
     /**

app/Service/Api/System/SiteListService.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 namespace App\Service\Api\System;
 
 use App\Cache\Redis\Api\SiteCache;
+use App\Constants\Common\SiteCode;
 use App\Extend\SystemUtil;
 use App\Model\Site;
 use App\Service\Api\BaseService;
@@ -36,6 +37,7 @@ class SiteListService extends BaseService
                 $query->where('name', 'like', "%$name%");
             })
 //            ->where('name', 'like', '%'.$this->request->input('search_value').'%')
+            ->where('is_del',SiteCode::SITE_NO_DEL)
             ->paginate($limit)
             ->toArray();
 

env.prod

@@ -1,6 +1,6 @@
 # [app] -- 集群配置需一致
 APP_NAME=hhl_meal
-APP_ENV=dev
+APP_ENV=prod
 API_RETURN_KEY=hch@shenzhen
 JWT_KEY=hch@shenzhen
 JWT_EXPIRE=2592000