mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-05-21 18:29:42 +08:00
parent baac92b479
commit 2b7398fb00
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/admin/logic/retail/CashierclassLogic.php
View File

@ -8,6 +8,7 @@ use app\common\logic\BaseLogic;
use app\common\model\goods\Unit; use app\common\model\goods\Unit;
use app\common\model\merchant\Merchant; use app\common\model\merchant\Merchant;
use app\common\model\retail\Cashierinfo; use app\common\model\retail\Cashierinfo;
use app\common\model\user\User;
use think\facade\Db; use think\facade\Db;
@ -156,7 +157,9 @@ class CashierclassLogic extends BaseLogic
$item['msg']='预计48小时发货'; $item['msg']='预计48小时发货';
$item['goods_unit']=Unit::where('id',$item['unit'])->value('name'); $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(); return $find->toArray();