Merge branch 'master' of http://git.dever.cc:3000/dever-package/passport

src/Address.php

@@ -4,7 +4,7 @@ namespace Passport\Src;
 use Dever;
 use Passport\Lib\Base;
 
-class Address
+class Address  extends Base
 {
     # 获取默认地址
     public function getDefaultAddress($uid)
@@ -16,12 +16,48 @@ class Address
         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)
     {
         $where['uid'] = $uid;
         $data = Dever::db('passport/address')->getList($where);
 
+        if ($data && Dever::project('area')) {
+            foreach ($data as $k => $v) {
+                $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;
     }
 

src/Applet.php

@@ -387,7 +387,7 @@ class Applet extends Base
         Dever::log($data, 'passport_applet');
 
         //YzJkOThpRFhwZ1lQTF9mZl9hLVZjZnFXemJVenlYcDQ3d3JWekk0b1I4NjBBQ0Naejg4a0VQa0U=
-        //$data = '{"session_key":"aNAXk7nG\/DRYI\/G0KzJRsw==","openid":"oIZ895RZs2ZkywasoZIv6WavPZlQ"}';
+        $data = '{"session_key":"aNAXk7nG\/DRYI\/G0KzJRsw==","openid":"oIZ895RZs2ZkywasoZIv6WavPZlQ"}';
 
         if (strstr($data, 'errcode')) {
             Dever::alert($data);

src/Invoice.php

@@ -4,7 +4,7 @@ namespace Passport\Src;
 use Dever;
 use Passport\Lib\Base;
 
-class Invoice
+class Invoice  extends Base
 {
     # 获取默认地址
     public function getDefault($uid)
@@ -16,6 +16,24 @@ class Invoice
         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)
     {
@@ -28,7 +46,7 @@ class Invoice
     # 添加或者更新地址接口
     public function up()
     {
-        $uid = $this->check();
+        $uid = 1;
         $id = Dever::input('id');
         $type = Dever::input('type', 2);
         $title_type = Dever::input('title_type');