fix : print data error

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/Option/PrintService.php

@@ -92,7 +92,7 @@ class PrintService extends CateringBaseService
      */
     public function cancel(): array
     {
-        $service = $this->printOrderFactory->handle($this->request->input('type'));
+        $service = $this->printOrderFactory->handle((int)$this->request->input('type'));
         $service->printId = (int)$this->request->input('print_id');
         $service->handle();
         $service->printCancel();

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

@@ -11,6 +11,7 @@ declare(strict_types=1);
 namespace App\Service\Admin\Catering\Print;
 
 use App\Exception\ErrException;
+use App\Lib\Log;
 use App\Lib\Print\YlyBasicsLib;
 use App\Model\Printer;
 use Hyperf\Di\Annotation\Inject;
@@ -58,6 +59,12 @@ class YlyPrintService implements PrintOrderInterface
     #[Inject]
     protected Printer $printerModel;
 
+    /**
+     * @var Log
+     */
+    #[Inject]
+    private Log $log;
+
     /**
      * @return void
      * @throws ContainerExceptionInterface
@@ -108,9 +115,12 @@ class YlyPrintService implements PrintOrderInterface
             empty($this->data['order_sno']) ||
             empty($this->data['username']) ||
             empty($this->data['mobile']) ||
-            empty($this->data['date']) ||
-            empty($this->data['heapsort'])
-        ) throw new ErrException('打印数据丢失');
+            empty($this->data['date'])
+//            empty($this->data['heapsort'])
+        ) {
+            $this->log->error('打印数据'.json_encode($this->data));
+            throw new ErrException('打印数据丢失');
+        }
     }
 
     /**
@@ -126,9 +136,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 +197,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";
     }
 
     /**
@@ -231,6 +238,8 @@ class YlyPrintService implements PrintOrderInterface
 
     /**
      * @return void
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     private function checkBoxLabelData(): void
     {
@@ -244,7 +253,10 @@ class YlyPrintService implements PrintOrderInterface
             empty($this->data['driver_name']) ||
             empty($this->data['current_num']) ||
             empty($this->data['date_text'])
-        ) throw new ErrException('打印数据丢失');
+        ) {
+            $this->log->error('打印数据'.json_encode($this->data));
+            throw new ErrException('打印数据丢失-01');
+        }
     }
 
     /**

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