|
@@ -4,7 +4,6 @@ import com.github.pagehelper.PageHelper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import com.txz.mall.core.Result;
|
|
|
import com.txz.mall.core.ResultCode;
|
|
|
-import com.txz.mall.model.StoreOrder;
|
|
|
import com.txz.mall.model.UserAddress;
|
|
|
import com.txz.mall.service.StoreOrderService;
|
|
|
import com.txz.mall.service.UserAddressService;
|
|
@@ -38,7 +37,7 @@ public class UserAddressController {
|
|
|
|
|
|
@PostMapping("/add")
|
|
|
@ApiOperation(value = "收获地址新增")
|
|
|
- public Result add(@RequestBody UserAddress userAddress, @RequestParam Long orderId) {
|
|
|
+ public Result<Long> add(@RequestBody UserAddress userAddress) {
|
|
|
if (userAddress == null) {
|
|
|
return Result.fail(ResultCode.OBJECT_IS_NULL);
|
|
|
}
|
|
@@ -46,22 +45,11 @@ public class UserAddressController {
|
|
|
userAddress.setCreateTime(new Date());
|
|
|
userAddress.setCreateUserId(userAddress.getUid());
|
|
|
userAddressService.save(userAddress);
|
|
|
- if (orderId != null) {
|
|
|
- StoreOrder storeOrder = new StoreOrder();
|
|
|
- storeOrder.setId(orderId);
|
|
|
- // 订单跟用户绑定
|
|
|
-// storeOrder.setRealName(userAddress.getRealName());
|
|
|
-// storeOrder.setUserPhone(userAddress.getPhone());
|
|
|
- String userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
|
|
|
- storeOrder.setUserAddress(userAddressStr);
|
|
|
- storeOrder.setAddressId(userAddress.getId());
|
|
|
- storeOrderService.update(storeOrder);
|
|
|
- }
|
|
|
} catch (Exception e) {
|
|
|
log.error("新增对象操作异常e:{}", e);
|
|
|
return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
|
|
|
}
|
|
|
- return Result.success();
|
|
|
+ return Result.success(userAddress.getId());
|
|
|
}
|
|
|
|
|
|
@PostMapping("/delete")
|
|
@@ -139,7 +127,7 @@ public class UserAddressController {
|
|
|
}
|
|
|
|
|
|
@PostMapping("/default")
|
|
|
- @ApiOperation(value = "默认地址")
|
|
|
+ @ApiOperation(value = "设置默认地址")
|
|
|
public Result defaultAddress(@RequestParam("id") Long id) {
|
|
|
if (id == null) {
|
|
|
return Result.fail(ResultCode.OBJECT_IS_NULL);
|
|
@@ -151,10 +139,35 @@ public class UserAddressController {
|
|
|
userAddress.setId(id);
|
|
|
userAddress.setIsDefault(1);
|
|
|
userAddressService.update(userAddress);
|
|
|
+
|
|
|
+ UserAddress address = userAddressService.findById(id);
|
|
|
+ if (address == null) {
|
|
|
+ return Result.fail(ResultCode.OBJECT_IS_NULL);
|
|
|
+ }
|
|
|
+ Condition condition = new Condition(userAddress.getClass());
|
|
|
+ Example.Criteria criteria = condition.createCriteria();
|
|
|
+ criteria.andEqualTo("isDelete", 0);
|
|
|
+ criteria.andEqualTo("uid", address.getUid());
|
|
|
+ criteria.andNotEqualTo("id", id);
|
|
|
+ List<UserAddress> list = userAddressService.findByCondition(condition);
|
|
|
+ for (UserAddress ua : list) {
|
|
|
+ ua.setIsDefault(0);
|
|
|
+ userAddressService.update(ua);
|
|
|
+ }
|
|
|
} catch (Exception e) {
|
|
|
log.error("更新对象操作异常e:{}", e);
|
|
|
return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
|
|
|
}
|
|
|
return Result.success();
|
|
|
}
|
|
|
+
|
|
|
+ @PostMapping("/getDefault")
|
|
|
+ @ApiOperation(value = "获取默认地址")
|
|
|
+ public Result<UserAddress> getDefault(@RequestParam("uid") Long uid) {
|
|
|
+ if (uid == null) {
|
|
|
+ return Result.fail(ResultCode.OBJECT_IS_NULL);
|
|
|
+ }
|
|
|
+ UserAddress userAddress = userAddressService.getDefaultByUid(uid);
|
|
|
+ return Result.success(userAddress);
|
|
|
+ }
|
|
|
}
|