dever 3 年之前
父節點
當前提交
79635457c9
共有 2 個文件被更改,包括 49 次插入8 次删除
  1. 31 8
      src/Address.php
  2. 18 0
      src/Invoice.php

+ 31 - 8
src/Address.php

@@ -16,6 +16,20 @@ class Address  extends Base
         return $data;
     }
 
+    # 获取某个收货地址
+    public function getOne($uid, $id)
+    {
+        $where['uid'] = $uid;
+        $where['id'] = $id;
+        $data = Dever::db('passport/address')->find($where);
+
+        if ($data && Dever::project('area')) {
+            $data = $this->getInfo($data);
+        }
+
+        return $data;
+    }
+
     # 获取地址列表
     public function getAddress($uid)
     {
@@ -24,20 +38,29 @@ class Address  extends Base
 
         if ($data && Dever::project('area')) {
             foreach ($data as $k => $v) {
-                $info = Dever::db('area/province')->find($v['province']);
-                $data[$k]['province_name'] = $info['name'];
-
-                $info = Dever::db('area/city')->find($v['city']);
-                $data[$k]['city_name'] = $info['name'];
-
-                $info = Dever::db('area/county')->find($v['county']);
-                $data[$k]['county_name'] = $info['name'];
+                $data[$k] = $this->getInfo($v);
             }
         }
 
         return $data;
     }
 
+    private function getInfo($data)
+    {
+        $info = Dever::db('area/province')->find($data['province']);
+        $data['province_name'] = $info['name'];
+
+        $info = Dever::db('area/city')->find($data['city']);
+        $data['city_name'] = $info['name'];
+
+        $info = Dever::db('area/county')->find($data['county']);
+        $data['county_name'] = $info['name'];
+
+        $data['add_string'] = $data['province_name'] . $data['city_name'] . $data['county_name'] .','. $data['address'] .','. $data['house_number'] .','. $data['contact'] .','. $data['mobile'];
+
+        return $data;
+    }
+
     # 添加或者更新地址接口
     public function up()
     {

+ 18 - 0
src/Invoice.php

@@ -16,6 +16,24 @@ class Invoice  extends Base
         return $data;
     }
 
+    # 获取某个收货地址
+    public function getOne($uid, $id)
+    {
+        $where['uid'] = $uid;
+        $where['id'] = $id;
+        $data = Dever::db('passport/invoice')->find($where);
+
+        if ($data) {
+            if ($data['title_type'] == 1) {
+                $data['title_type_name'] = '企业单位';
+            } else {
+                $data['title_type_name'] = '个人';
+            }
+        }
+
+        return $data;
+    }
+
     # 获取地址列表
     public function get($uid)
     {