From cdc1619a7bc28d9be4992ef4053edd16006f4097 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Fri, 26 Oct 2018 18:58:10 +0800
Subject: [PATCH] =?UTF-8?q?fix[litemall-wx-api,=20litemall-wx]:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../linlinjava/litemall/wx/web/WxAddressController.java  | 8 +++++---
 litemall-wx/pages/ucenter/addressAdd/addressAdd.js       | 9 ++++-----
 renard-wx/pages/ucenter/addressAdd/addressAdd.js         | 9 ++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
index ebad82fc..3e398f58 100644
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java
@@ -85,10 +85,11 @@ public class WxAddressController {
      *           name: xxx,
      *           provinceId: xxx,
      *           cityId: xxx,
-     *           districtId: xxx,
+     *           areaId: xxx,
      *           mobile: xxx,
      *           address: xxx,
      *           isDefault: xxx,
+     *           version: xxx
      *           provinceName: xxx,
      *           cityName: xxx,
      *           areaName: xxx
@@ -112,10 +113,11 @@ public class WxAddressController {
         data.put("name", address.getName());
         data.put("provinceId", address.getProvinceId());
         data.put("cityId", address.getCityId());
-        data.put("districtId", address.getAreaId());
+        data.put("areaId", address.getAreaId());
         data.put("mobile", address.getMobile());
         data.put("address", address.getAddress());
         data.put("isDefault", address.getIsDefault());
+        data.put("version", address.getVersion());
         String pname = regionService.findById(address.getProvinceId()).getName();
         data.put("provinceName", pname);
         String cname = regionService.findById(address.getCityId()).getName();
@@ -211,7 +213,7 @@ public class WxAddressController {
                 return ResponseUtil.updatedDateExpired();
             }
         }
-        return ResponseUtil.ok(address.getId());
+        return ResponseUtil.ok(address);
     }
 
     /**
diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js
index 9fc20665..102c7239 100644
--- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js
+++ b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js
@@ -14,6 +14,7 @@ Page({
       name: '',
       mobile: '',
       isDefault: 0,
+      version: 0,
       provinceName: '',
       cityName: '',
       areaName: ''
@@ -302,9 +303,7 @@ Page({
       areaId: address.areaId,
       address: address.address,
       isDefault: address.isDefault,
-      provinceName: address.provinceName,
-      cityName: address.cityName,
-      countyName: address.areaName
+      version: address.version
     }, 'POST').then(function (res) {
       if (res.errno === 0) {
         //返回之前，先取出上一页对象，并设置addressId
@@ -313,11 +312,11 @@ Page({
         console.log(prevPage);
         if (prevPage.route == "pages/checkout/checkout") {
           prevPage.setData({
-            addressId: res.data
+            addressId: res.data.id
           })
 
           try {
-            wx.setStorageSync('addressId', res.data);
+            wx.setStorageSync('addressId', res.data.id);
           } catch (e) {
 
           }
diff --git a/renard-wx/pages/ucenter/addressAdd/addressAdd.js b/renard-wx/pages/ucenter/addressAdd/addressAdd.js
index c58abbaa..a2ac5be8 100644
--- a/renard-wx/pages/ucenter/addressAdd/addressAdd.js
+++ b/renard-wx/pages/ucenter/addressAdd/addressAdd.js
@@ -14,6 +14,7 @@ Page({
       name: '',
       mobile: '',
       isDefault: 0,
+      version: 0,
       provinceName: '',
       cityName: '',
       areaName: ''
@@ -302,9 +303,7 @@ Page({
       areaId: address.areaId,
       address: address.address,
       isDefault: address.isDefault,
-      provinceName: address.provinceName,
-      cityName: address.cityName,
-      countyName: address.areaName
+      version: address.version
     }, 'POST').then(function (res) {
       if (res.errno === 0) {
         //返回之前，先取出上一页对象，并设置addressId
@@ -313,11 +312,11 @@ Page({
         console.log(prevPage);
         if (prevPage.route == "pages/checkout/checkout") {
           prevPage.setData({
-            addressId: res.data
+            addressId: res.data.id
           })
 
           try {
-            wx.setStorageSync('addressId', res.data);
+            wx.setStorageSync('addressId', res.data.id);
           } catch (e) {
 
           }