Merge branch 'dev' of https://gitea.lihaink.cn/chenbo/lihai-finance-pay into dev

server/app/adminapi/lists/SubMerchantLists.php

@@ -18,6 +18,7 @@ namespace app\adminapi\lists;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\SubMerchant;
 use app\common\lists\ListsSearchInterface;
+use think\facade\Db;
 
 
 /**
@@ -39,6 +40,7 @@ class SubMerchantLists extends BaseAdminDataLists implements ListsSearchInterfac
     {
         return [
             '=' => ['sub_merchant_name', 'sub_mch_id', 'province', 'city', 'area', 'street', 'village'],
+
         ];
     }
 
@@ -58,6 +60,18 @@ class SubMerchantLists extends BaseAdminDataLists implements ListsSearchInterfac
             ->field(['id', 'sub_merchant_name', 'sub_mch_id', 'province', 'city', 'area', 'street', 'village'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
+            ->withAttr('province',function($value,$data){
+                return Db::name('geo_province')->where('province_code',$value)->value('province_name');
+            })
+            ->withAttr('city',function($value,$data){
+                return Db::name('geo_city')->where('city_code',$value)->value('city_name');
+            })
+            ->withAttr('area',function($value,$data){
+                return Db::name('geo_area')->where('area_code',$value)->value('area_name');
+            })
+            ->withAttr('street',function($value,$data){
+                return Db::name('geo_street')->where('street_code',$value)->value('street_name');
+            })
             ->select()
             ->toArray();
     }

server/app/adminapi/logic/SubMerchantLogic.php

@@ -113,6 +113,18 @@ class SubMerchantLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return SubMerchant::findOrEmpty($params['id'])->toArray();
+        return SubMerchant::findOrEmpty($params['id']) ->withAttr('province',function($value,$data){
+            return Db::name('geo_province')->where('province_code',$value)->value('province_name');
+        })
+            ->withAttr('city',function($value,$data){
+                return Db::name('geo_city')->where('city_code',$value)->value('city_name');
+            })
+            ->withAttr('area',function($value,$data){
+                return Db::name('geo_area')->where('area_code',$value)->value('area_name');
+            })
+            ->withAttr('street',function($value,$data){
+                return Db::name('geo_street')->where('street_code',$value)->value('street_name');
+            })
+            ->toArray();
     }
 }

server/app/common/model/SubMerchant.php

@@ -0,0 +1,57 @@
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\common\model;
+
+
+use app\common\model\BaseModel;
+use think\facade\Db;
+
+
+/**
+ * SubMerchant模型
+ * Class SubMerchant
+ * @package app\common\model
+ */
+class SubMerchant extends BaseModel
+{
+    
+    protected $name = 'sub_merchant';
+
+    public function getProvinceNameAttr($value)
+    {
+        return Db::name('geo_province')->where(['province_code' => $this->province])->value('province_name');
+    }
+
+    public function getCityNameAttr($value)
+    {
+        return Db::name('geo_city')->where(['city_code' => $this->city])->value('city_name');
+    }
+
+    public function getAreaNameAttr($value)
+    {
+        return Db::name('geo_area')->where(['area_code' => $this->area])->value('area_name');
+    }
+
+    public function getStreetNameAttr($value)
+    {
+        return Db::name('geo_street')->where(['street_code' => $this->street])->value('street_name');
+    }
+
+    public function getVillageNameAttr($value)
+    {
+        return Db::name('geo_village')->where(['village_code' => $this->village])->value('village_name');
+    }
+    
+}