diff --git a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java index 433e5da..a89bbcf 100644 --- a/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java +++ b/ebike-user/src/main/java/com/cdzy/user/controller/EbikeUserController.java @@ -62,7 +62,7 @@ public class EbikeUserController { public JsonResult silentLogin(@RequestParam(name = "js_code") String code) { JsonNode result = verifyUtil.wechatAuthority(code); if (result == null) { - return JsonResult.failed("微信登录失败"); + throw new EbikeException("微信登录失败"); } if (result.has("errcode")) { return JsonResult.failed(String.format("微信登录失败 %s", result.get("errmsg").asText())); @@ -137,7 +137,7 @@ public class EbikeUserController { // 需要检测用户是否还有未支付的订单,如果有则不能注销 EbikeOrder unPayed = ebikeOrderTransactionService.checkHistoryOrder(ebikeUser.getUserId()); if (unPayed != null) { - return JsonResult.failed("用户还有未完成的订单,不能注销", unPayed); + throw new EbikeException("用户还有未完成的订单,不能注销"); } // 注销用户信息 ebikeUserService.deRegister(ebikeUser); @@ -162,9 +162,9 @@ public class EbikeUserController { * @param userId 用户信息主键 * @return 用户信息详情 */ - @GetMapping("getInfo") - public JsonResult getInfo(@RequestParam(name = "userId") Long userId) { - EbikeUser user = ebikeUserService.getById(userId); + @GetMapping("getInfoByUserId") + public JsonResult getInfoByUserId(@RequestParam(name = "userId") Long userId) { + EbikeUserVo user = ebikeUserService.getUserInfoByUserId(userId); return JsonResult.success(user); } diff --git a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeUserServiceImpl.java b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeUserServiceImpl.java index cdaea08..f7718b4 100644 --- a/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeUserServiceImpl.java +++ b/ebike-user/src/main/java/com/cdzy/user/service/impl/EbikeUserServiceImpl.java @@ -1,5 +1,6 @@ package com.cdzy.user.service.impl; +import com.cdzy.common.ex.EbikeException; import com.cdzy.user.enums.UserStatus; import com.cdzy.user.mapper.EbikeUserMapper; import com.cdzy.user.model.dto.EbikeUserPageDto; @@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import static com.cdzy.user.model.entity.table.EbikeUserRealInfoTableDef.EBIKE_USER_REAL_INFO; import static com.cdzy.user.model.entity.table.EbikeUserTableDef.EBIKE_USER; @@ -104,14 +106,10 @@ public class EbikeUserServiceImpl extends ServiceImpl