From 2b7398fb00b1bfc7cac70450231bbff9d889d7ef Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Tue, 21 May 2024 18:29:42 +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 | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/admin/logic/retail/CashierclassLogic.php b/app/admin/logic/retail/CashierclassLogic.php
index 257755a..5c5de21 100644
--- a/app/admin/logic/retail/CashierclassLogic.php
+++ b/app/admin/logic/retail/CashierclassLogic.php
@@ -8,6 +8,7 @@ use app\common\logic\BaseLogic;
use app\common\model\goods\Unit;
use app\common\model\merchant\Merchant;
use app\common\model\retail\Cashierinfo;
+use app\common\model\user\User;
use think\facade\Db;
@@ -156,7 +157,9 @@ class CashierclassLogic extends BaseLogic
$item['msg']='预计48小时发货';
$item['goods_unit']=Unit::where('id',$item['unit'])->value('name');
});
- $find['merchant_info']=Merchant::where('mer_id',$find['merchant'])->field('mer_id,mer_name,service_phone')->find();
+ $merchant=Merchant::where('mer_id',$find['merchant'])->field('mer_id,uid,mer_name,service_phone,mer_address')->find();
+ $merchant['real_name']=User::where('id',$merchant['uid'])->value('real_name');
+ $find['merchant_info']=$merchant;
}
return $find->toArray();