diff --git a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/UserAddressController.java b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/UserAddressController.java index 307d724..9061c43 100644 --- a/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/UserAddressController.java +++ b/api-interface/itmk-base-parent/itmk-base-web/src/main/java/com/itmk/web/wxapi/controller/UserAddressController.java @@ -19,8 +19,8 @@ public class UserAddressController { //新增地址 @PostMapping - public ResultVo add(@RequestBody UserAddress userAddress){ - if(userAddressService.save(userAddress)){ + public ResultVo add(@RequestBody UserAddress userAddress) { + if (userAddressService.save(userAddress)) { return ResultUtils.success("新增地址成功!"); } return ResultUtils.error("新增地址失败!"); @@ -28,13 +28,13 @@ public class UserAddressController { //编辑地址 @PutMapping - public ResultVo edit(@RequestBody UserAddress userAddress){ + public ResultVo edit(@RequestBody UserAddress userAddress) { //先全部更新为不是默认 LambdaUpdateWrapper query = new LambdaUpdateWrapper<>(); - query.eq(UserAddress::getOpenid,userAddress.getOpenid()).set(UserAddress::getStatus,"0"); + query.eq(UserAddress::getOpenid, userAddress.getOpenid()).set(UserAddress::getStatus, "0"); userAddressService.update(query); //更新当前编辑的这条数据 - if(userAddressService.updateById(userAddress)){ + if (userAddressService.updateById(userAddress)) { return ResultUtils.success("编辑地址成功!"); } return ResultUtils.error("编辑地址失败!"); @@ -42,12 +42,23 @@ public class UserAddressController { //列表 @GetMapping("/list") - public ResultVo list(String openid){ + public ResultVo list(String openid) { //排序:按status排序,默认的排在第一条 QueryWrapper query = new QueryWrapper<>(); - query.lambda().eq(UserAddress::getOpenid,openid); + query.lambda().eq(UserAddress::getOpenid, openid); query.lambda().orderByDesc(UserAddress::getStatus); List list = userAddressService.list(query); - return ResultUtils.success("查询成功",list); + return ResultUtils.success("查询成功", list); + } + + //获取默认地址 + @GetMapping("/getAddress") + public ResultVo getAddress(String openid) { + QueryWrapper query = new QueryWrapper<>(); + query.lambda().eq(UserAddress::getOpenid, openid) + .eq(UserAddress::getStatus, "1"); + UserAddress address = userAddressService.getOne(query); + return ResultUtils.success("查询成功", address); } } + diff --git a/order-app/src/api/user.js b/order-app/src/api/user.js index babf3dd..1f806b6 100644 --- a/order-app/src/api/user.js +++ b/order-app/src/api/user.js @@ -48,17 +48,21 @@ export const userLogin = async () => { } //新增地址 export const addAddressApi = (parm) => { + console.log("新增地址成功") return http.post("/wxapi/address", parm) } //地址列表 export const addressListApi = (parm) => { + console.log("查询地址列表成功") return http.get("/wxapi/address/list", parm) } //编辑地址 export const editAddressApi = (parm) => { + console.log("编辑地址成功") return http.put("/wxapi/address", parm) } //默认地址查询 export const getAddressApi = (parm) => { + console.log("查询默认地址成功") return http.get("/wxapi/address/getAddress", parm) } \ No newline at end of file