船厂

app/data/controller/api/business/User.php

@@ -3,6 +3,7 @@
 namespace app\data\controller\api\business;
 
 use app\data\controller\api\Auth;
+use app\data\model\DataMerchants;
 use app\data\model\ShopFeedback;
 use app\data\model\SystemUserAddress;
 use app\data\model\SystemUserAmount;
@@ -33,10 +34,20 @@ class User extends Auth
     /**
      * @Title ("用户信息")
      * @Method ("get")
-     * @return void
+     * @Returned("merchant.head_img",desc="商家头像")
+     * @Returned("merchant.name",desc="商家名称")
+     * @Returned("merchant.full_address",desc="详细地址")
+     * @Returned("merchant.contact_name",desc="联系人")
+     * @Returned("merchant.contact_phone",desc="联系电话")
+     * @Returned("merchant.intro",desc="商家简介")
+     * @Returned("merchant.imgs_videos",desc="图片及视频")
+     * @Returned("merchant.business_img",desc="营业执照")
+     * @Returned("merchant.longitude",desc="经度")
+     * @Returned("merchant.latitude",desc="纬度")
      */
     public function user_info(){
         $user_info = $this->user;
+        $user_info['merchant']=DataMerchants::getByAdmin($user_info['id']);
         $this->success('用户信息',$user_info);
     }
 

app/data/model/DataMerchants.php

@@ -44,4 +44,7 @@ class DataMerchants extends Model
     public function getCompanyAttr($_,$model){
         return $model['name']??'';
     }
+    public static function getByAdmin($adminId){
+        return self::where('admin_id',$adminId)->find();
+    }
 }