fix[litemall-wx-api, litemall-wx]: 重新修复收货地址不能修改
This commit is contained in:
@@ -53,6 +53,10 @@ public class ResponseUtil {
|
||||
return fail(403, "更新数据已经失效");
|
||||
}
|
||||
|
||||
public static Object updatedDataFailed(){
|
||||
return fail(404, "更新数据失败");
|
||||
}
|
||||
|
||||
public static Object unlogin(){
|
||||
return fail(501, "请登录");
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -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) {
|
||||
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user