船厂

app/data/model/DataMerchants.php

@@ -16,6 +16,7 @@ class DataMerchants extends Model
     protected $append=[
         'full_address',
         'audit_text',
+        'company',
     ];
     /**
      * 格式化创建时间
@@ -40,4 +41,7 @@ class DataMerchants extends Model
             3=>'审核部通过',
         ][$model['audit']];
     }
+    public function getCompanyAttr($_,$model){
+        return $model['name']??'';
+    }
 }

app/data/model/ShopCoordination.php

@@ -18,7 +18,7 @@ class ShopCoordination extends Model
         'file'=>'array',
     ];
     public function merchant(){
-        return $this->belongsTo(SystemUser::class,'admin_id');
+        return $this->belongsTo(DataMerchants::class,'admin_id','admin_id');
     }
     public function items(){
         return $this->hasMany(ShopCoordinationItem::class,'coordination_id');

app/data/model/ShopOcean.php

@@ -18,7 +18,7 @@ class ShopOcean extends Model
         'file'=>'array',
     ];
     public function merchant(){
-        return $this->belongsTo(SystemUser::class,'admin_id');
+        return $this->belongsTo(DataMerchants::class,'admin_id','admin_id');
     }
     public function items(){
         return $this->hasMany(ShopOceanItem::class,'ocean_id');

app/data/model/ShopProduction.php

@@ -18,7 +18,7 @@ class ShopProduction extends Model
         'file'=>'array',
     ];
     public function merchant(){
-        return $this->belongsTo(SystemUser::class,'admin_id');
+        return $this->belongsTo(DataMerchants::class,'admin_id','admin_id');
     }
     public function items(){
         return $this->hasMany(ShopProductionItem::class,'production_id');

app/data/model/ShopPurchase.php

@@ -33,7 +33,7 @@ class ShopPurchase extends Model
         return self::$status;
     }
     public function merchant(){
-        return $this->belongsTo(SystemUser::class,'admin_id');
+        return $this->belongsTo(DataMerchants::class,'admin_id','admin_id');
     }
     public function items(){
         return $this->hasMany(ShopPurchaseItem::class,'purchase_id');

app/data/model/ShopPurchaseMsg.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace app\data\model;
-
-use think\admin\Model;
-
-class ShopPurchaseMsg extends Model
-{
-    public function target(){
-        return $this->morphTo('target',[
-            'shop_purchase'=>ShopPurchase::class,
-            'shop_production'=>ShopProduction::class,
-            'shop_ocean'=>ShopOcean::class,
-            'shop_coordination'=>ShopCoordination::class,
-        ]);
-    }
-    public function user(){
-        return $this->belongsTo(DataUser::class,'user_id');
-    }
-    public function merchant(){
-        return $this->belongsTo(SystemUser::class,'m_id');
-    }
-    public function makePos($user){
-        if($user instanceof DataUser){
-            return $this['is_mine']=$this['user_id']==$user['id'];
-        }
-        if($user instanceof SystemUser){
-            return $this['is_mine']=$this['m_id']==$user['id'];
-        }
-        return false;
-    }
-}