From 9c1d2dd62ed1069e4a8d4a040975519544e13af0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Thu, 30 May 2024 16:15:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8F=90=E4=BE=9B=E6=9B=B4=E8=AF=A6?=
 =?UTF-8?q?=E7=BB=86=E7=9A=84=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E5=BC=80=E6=94=BE=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E7=BB=99=E5=B7=B2=E6=89=93=E5=8D=B0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/retail/CashierclassController.php | 2 +-
 app/admin/logic/retail/CashierclassLogic.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/retail/CashierclassController.php b/app/admin/controller/retail/CashierclassController.php
index 07b9375..cbaf9eb 100644
--- a/app/admin/controller/retail/CashierclassController.php
+++ b/app/admin/controller/retail/CashierclassController.php
@@ -144,7 +144,7 @@ class CashierclassController extends BaseAdminController
         }else{
             $res=CashierclassLogic::prints($id);
             if(CashierclassLogic::hasError()){
-                return $this->fail('打印失败');
+                return $this->fail(CashierclassLogic::getError());
             }else{
                 return $this->success('ok',$res);
             }
diff --git a/app/admin/logic/retail/CashierclassLogic.php b/app/admin/logic/retail/CashierclassLogic.php
index 6362811..4ca6abf 100644
--- a/app/admin/logic/retail/CashierclassLogic.php
+++ b/app/admin/logic/retail/CashierclassLogic.php
@@ -170,7 +170,7 @@ class CashierclassLogic extends BaseLogic
      * 打印
      */
     public static function prints($id){
-        $find = Cashierclass::where('id', $id)->where('is_print',0)->field('id,merchant,real_name,user_phone,user_address,uid,number,total,actual,create_time')->find();
+        $find = Cashierclass::where('id', $id)->field('id,merchant,real_name,user_phone,user_address,uid,number,total,actual,create_time')->find();
         if ($find) {
             $merchant = Merchant::where('mer_id', $find['merchant'])->field('mer_name,uid,service_phone')->find();
             $mer_user_info = User::where('id', $merchant['uid'])->field('real_name,mobile')->find();