diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java index 08821b40..3902d476 100644 --- a/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java +++ b/litemall-core/src/main/java/org/linlinjava/litemall/core/util/ResponseUtil.java @@ -53,6 +53,10 @@ public class ResponseUtil { return fail(403, "更新数据已经失效"); } + public static Object updatedDataFailed(){ + return fail(404, "更新数据失败"); + } + public static Object unlogin(){ return fail(501, "请登录"); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAddressService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAddressService.java index 7cee6952..a98218fa 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAddressService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAddressService.java @@ -29,8 +29,8 @@ public class LitemallAddressService { return addressMapper.insertSelective(address); } - public int updateId(LitemallAddress address) { - return addressMapper.updateWithVersionByPrimaryKeySelective(address.getVersion(), address); + public int update(LitemallAddress address) { + return addressMapper.updateByPrimaryKeySelective(address); } public void delete(Integer id) { 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 3e398f58..558b734d 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 @@ -209,11 +209,11 @@ public class WxAddressController { addressService.add(address); } else { address.setUserId(userId); - if(addressService.updateId(address) == 0){ - return ResponseUtil.updatedDateExpired(); + if(addressService.update(address) == 0){ + return ResponseUtil.updatedDataFailed(); } } - return ResponseUtil.ok(address); + return ResponseUtil.ok(address.getId()); } /** diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js index 102c7239..620253c4 100644 --- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.js +++ b/litemall-wx/pages/ucenter/addressAdd/addressAdd.js @@ -14,7 +14,6 @@ Page({ name: '', mobile: '', isDefault: 0, - version: 0, provinceName: '', cityName: '', areaName: '' @@ -302,8 +301,7 @@ Page({ cityId: address.cityId, areaId: address.areaId, address: address.address, - isDefault: address.isDefault, - version: address.version + isDefault: address.isDefault }, 'POST').then(function (res) { if (res.errno === 0) { //返回之前,先取出上一页对象,并设置addressId @@ -312,11 +310,11 @@ Page({ console.log(prevPage); if (prevPage.route == "pages/checkout/checkout") { prevPage.setData({ - addressId: res.data.id + addressId: res.data }) try { - wx.setStorageSync('addressId', res.data.id); + wx.setStorageSync('addressId', res.data); } catch (e) { } diff --git a/renard-wx/pages/ucenter/addressAdd/addressAdd.js b/renard-wx/pages/ucenter/addressAdd/addressAdd.js index a2ac5be8..9356f342 100644 --- a/renard-wx/pages/ucenter/addressAdd/addressAdd.js +++ b/renard-wx/pages/ucenter/addressAdd/addressAdd.js @@ -14,7 +14,6 @@ Page({ name: '', mobile: '', isDefault: 0, - version: 0, provinceName: '', cityName: '', areaName: '' @@ -302,8 +301,7 @@ Page({ cityId: address.cityId, areaId: address.areaId, address: address.address, - isDefault: address.isDefault, - version: address.version + isDefault: address.isDefault }, 'POST').then(function (res) { if (res.errno === 0) { //返回之前,先取出上一页对象,并设置addressId @@ -312,11 +310,11 @@ Page({ console.log(prevPage); if (prevPage.route == "pages/checkout/checkout") { prevPage.setData({ - addressId: res.data.id + addressId: res.data }) try { - wx.setStorageSync('addressId', res.data.id); + wx.setStorageSync('addressId', res.data); } catch (e) { }