From 1fa0d3d5e5a230e5c9d594d6337f61291ffdbf77 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 6 May 2024 14:16:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/retail/CashierclassLogic.php | 6 +++++-
 app/common/model/retail/Cashierinfo.php      | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/admin/logic/retail/CashierclassLogic.php b/app/admin/logic/retail/CashierclassLogic.php
index 1baa2bf..8bc911a 100644
--- a/app/admin/logic/retail/CashierclassLogic.php
+++ b/app/admin/logic/retail/CashierclassLogic.php
@@ -5,6 +5,7 @@ namespace app\admin\logic\retail;
 
 use app\common\model\retail\Cashierclass;
 use app\common\logic\BaseLogic;
+use app\common\model\goods\Unit;
 use app\common\model\retail\Cashierinfo;
 use think\facade\Db;
 
@@ -116,7 +117,10 @@ class CashierclassLogic extends BaseLogic
         if($find){
            $find['goods_list']= Cashierinfo::where('pid',$params['id'])
             ->with('goodsName')
-            ->field('goods,price sell,nums')->select();
+            ->field('goods,price sell,nums')->select()->each(function($item){
+                $item['msg']='预计48小时发货';
+                $item['goods_unit']=Unit::where('id',$item['unit'])->value('name');
+            });
         }
         return $find->toArray();
     }
diff --git a/app/common/model/retail/Cashierinfo.php b/app/common/model/retail/Cashierinfo.php
index 96f176a..0b7f46c 100644
--- a/app/common/model/retail/Cashierinfo.php
+++ b/app/common/model/retail/Cashierinfo.php
@@ -21,6 +21,6 @@ class Cashierinfo extends BaseModel
 
     public function goodsName()
     {
-        return $this->hasOne(Goods::class,'id','goods')->bind(['class_name'=>'name','imgs']);
+        return $this->hasOne(Goods::class,'id','goods')->bind(['class_name'=>'name','imgs','unit']);
     }
 }
\ No newline at end of file