From f079021ca4a522ba0d8a52d14145a40df4cd4dc6 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 19 Mar 2024 16:05:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/MemberController.java | 39 +++++++++++-------- .../jsowell/api/uniapp/TempController.java | 15 ++++--- .../common/enums/ykc/ReturnCodeEnum.java | 1 + 3 files changed, 30 insertions(+), 25 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index 4f8b8c0e9..63fa66692 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java @@ -57,7 +57,7 @@ public class MemberController extends BaseController { */ @PostMapping("/sendSMS") public RestApiResponse sendSMS(HttpServletRequest request, @RequestBody MemberRegisterAndLoginDTO dto) { - logger.info("下发短信接口 param:{}", JSONObject.toJSONString(dto)); + // logger.info("下发短信接口 param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { if (StringUtils.isBlank(dto.getMobileNumber())) { @@ -69,7 +69,7 @@ public class MemberController extends BaseController { logger.error("下发短信接口 发生异常 error", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_SEND_SMS_ERROR); } - logger.info("下发短信接口 result:{}", JSONObject.toJSONString(response)); + logger.info("下发短信接口, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response)); return response; } @@ -81,7 +81,7 @@ public class MemberController extends BaseController { */ @PostMapping("/memberRegisterAndLogin") public RestApiResponse memberRegisterAndLogin(HttpServletRequest request, @RequestBody MemberRegisterAndLoginDTO dto) { - logger.info("会员登录注册接口 param:{}", JSONObject.toJSONString(dto)); + logger.info("会员登录注册接口 param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { String appId = request.getHeader("appId"); @@ -136,7 +136,7 @@ public class MemberController extends BaseController { */ @PostMapping("/saveUserInfo") public RestApiResponse saveUserInfo(HttpServletRequest request, @RequestBody MemberRegisterDTO dto) { - logger.info("接受前端用户信息并处理 param:{}", JSONObject.toJSONString(dto)); + // logger.info("接受前端用户信息并处理 param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); @@ -146,7 +146,7 @@ public class MemberController extends BaseController { logger.error("处理用户信息异常", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_HANDLE_USER_INFO_ERROR); } - logger.info("接受前端用户信息并处理 result:{}", response); + logger.info("接受前端用户信息并处理, param:{}, result:{}", JSON.toJSONString(dto), JSON.toJSONString(response)); return response; } @@ -266,19 +266,23 @@ public class MemberController extends BaseController { */ @GetMapping("/getMemberCarNoInfo") public RestApiResponse getMemberCarNoInfo(HttpServletRequest request) { - String memberId = getMemberIdByAuthorization(request); - logger.info("通过 memberId 查询用户个人基本信息 param:{}", memberId); + // logger.info("通过 memberId 查询用户个人基本信息 param:{}", memberId); RestApiResponse response = null; + String memberId = null; try { + memberId = getMemberIdByAuthorization(request); MemberPlateNumberRelation info = new MemberPlateNumberRelation(); info.setMemberId(memberId); List resultList = memberPlateNumberRelationService.selectMemberPlateNumberRelationList(info); response = new RestApiResponse<>(resultList); + } catch (BusinessException e) { + logger.error("通过 memberId 查询用户个人基本信息 error", e); + response = new RestApiResponse<>(e.getCode(), e.getMessage()); } catch (Exception e) { logger.error("通过 memberId 查询用户个人基本信息 error", e); - response = new RestApiResponse<>(e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_MEMBER_CAR_NO_INFO_ERROR); } - logger.info("通过 memberId 查询用户个人基本信息 result:{}", response); + logger.info("通过memberId查询用户个人基本信息, memberId:{}, result:{}", memberId, JSON.toJSONString(response)); return response; } @@ -291,7 +295,8 @@ public class MemberController extends BaseController { */ @PostMapping("/memberBindingCarNo") public RestApiResponse memberBindingCarNo(HttpServletRequest request, @RequestBody BindingCarNoDTO dto) { - logger.info("用户绑定车牌号 param:{}", JSONObject.toJSONString(dto)); + // logger.info("用户绑定车牌号 param:{}", JSON.toJSONString(dto)); + RestApiResponse response = null; try { // 参数校验 @@ -309,7 +314,7 @@ public class MemberController extends BaseController { logger.error("用户绑定车牌号 error", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_USER_BINDING_CARNO_ERROR); } - logger.info("用户绑定车牌号 result:{}", response); + logger.info("用户绑定车牌号, param:{}, result:{}", JSON.toJSONString(dto), response); return response; } @@ -321,7 +326,7 @@ public class MemberController extends BaseController { */ @PostMapping("/memberUpdatePlateNumber") public RestApiResponse memberUpdatePlateNumber(HttpServletRequest request, @RequestBody BindingCarNoDTO dto) { - logger.info("用户修改车牌号 params:{}", JSONObject.toJSONString(dto)); + logger.info("用户修改车牌号 params:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); @@ -351,7 +356,7 @@ public class MemberController extends BaseController { */ @PostMapping("/memberUnbindCarNo") public RestApiResponse memberUnbindCarNo(@RequestBody BindingCarNoDTO dto) { - logger.info("用户解绑车牌号 params:{}", JSONObject.toJSONString(dto)); + logger.info("用户解绑车牌号 params:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { // String memberId = getMemberIdByAuthorization(request); @@ -376,7 +381,7 @@ public class MemberController extends BaseController { */ @PostMapping("/memberBindingCard") public RestApiResponse memberBindingCard(HttpServletRequest request, @RequestBody BindingCardDTO dto) { - logger.info("用户绑定鉴权卡 param:{}", JSONObject.toJSONString(dto)); + logger.info("用户绑定鉴权卡 param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); @@ -403,7 +408,7 @@ public class MemberController extends BaseController { */ @PostMapping("/memberUnbindingCard") public RestApiResponse memberUnbindingCard(HttpServletRequest request, @RequestBody BindingCardDTO dto) { - logger.info("用户解绑鉴权卡 param:{}", JSONObject.toJSONString(dto)); + logger.info("用户解绑鉴权卡 param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); @@ -449,7 +454,7 @@ public class MemberController extends BaseController { */ @PostMapping("/updateMemberInvoiceTitle") public RestApiResponse updateMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) { - logger.info("修改会员发票抬头 param:{}", JSONObject.toJSONString(dto)); + logger.info("修改会员发票抬头 param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); @@ -475,7 +480,7 @@ public class MemberController extends BaseController { */ @PostMapping("/deleteMemberInvoiceTitle") public RestApiResponse deleteMemberInvoiceTitle(HttpServletRequest request, @RequestBody InvoiceTitleDTO dto) { - logger.info("修改会员发票抬头 param:{}", JSONObject.toJSONString(dto)); + logger.info("修改会员发票抬头 param:{}", JSON.toJSONString(dto)); RestApiResponse response = null; try { String memberId = getMemberIdByAuthorization(request); diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 7d1deef68..1a17cd6eb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -1,7 +1,6 @@ package com.jsowell.api.uniapp; import com.alibaba.fastjson2.JSON; -import com.alibaba.fastjson2.JSONObject; import com.jsowell.adapay.dto.BalancePaymentRequestDTO; import com.jsowell.adapay.service.AdapayService; import com.jsowell.common.annotation.Anonymous; @@ -92,7 +91,7 @@ public class TempController extends BaseController { logger.error("临时刷数据接口 error", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_PILE_DETAIL_ERROR); } - logger.info("临时刷数据接口 result:{}", JSONObject.toJSONString(response)); + logger.info("临时刷数据接口 result:{}", JSON.toJSONString(response)); return response; } @@ -115,7 +114,7 @@ public class TempController extends BaseController { logger.error("临时订单退款接口 error", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR); } - logger.info("临时刷数据接口 result:{}", JSONObject.toJSONString(response)); + logger.info("临时刷数据接口 result:{}", JSON.toJSONString(response)); return response; } @@ -139,7 +138,7 @@ public class TempController extends BaseController { logger.error("临时订单退款接口 error", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR); } - logger.info("临时刷数据接口 result:{}", JSONObject.toJSONString(response)); + logger.info("临时刷数据接口 result:{}", JSON.toJSONString(response)); return response; } @@ -174,7 +173,7 @@ public class TempController extends BaseController { logger.error("临时接口计算站点订单报表 error", e); response = new RestApiResponse<>("00300003", "临时接口计算站点订单报表error"); } - logger.info("临时接口计算站点订单报表 result:{}", JSONObject.toJSONString(response)); + logger.info("临时接口计算站点订单报表 result:{}", JSON.toJSONString(response)); return response; } @@ -277,7 +276,7 @@ public class TempController extends BaseController { logger.error("手动接口执行订单分账逻辑-error", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR); } - logger.info("手动接口执行订单分账逻辑-result:{}", JSONObject.toJSONString(response)); + logger.info("手动接口执行订单分账逻辑-result:{}", JSON.toJSONString(response)); return response; } @@ -298,7 +297,7 @@ public class TempController extends BaseController { logger.error("测试余额支付接口error", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_WEIXIN_REFUND_ERROR); } - logger.info("测试余额支付接口result:{}", JSONObject.toJSONString(response)); + logger.info("测试余额支付接口result:{}", JSON.toJSONString(response)); return response; } @@ -311,7 +310,7 @@ public class TempController extends BaseController { */ @PostMapping("/batchWechatRefund") public RestApiResponse batchWechatRefund(@RequestBody ApplyRefundDTO dto) { - logger.info("批量余额退款接口 params:{}", JSONObject.toJSONString(dto)); + logger.info("批量余额退款接口 params:{}", JSON.toJSONString(dto)); RestApiResponse response = null; List memberIdList = dto.getMemberIdList(); try { diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java index ffce3f1b3..ad2e755ab 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java @@ -133,6 +133,7 @@ public enum ReturnCodeEnum { CODE_GET_UNPAY_OCCUPY_ORDER_ERROR("00100063", "查询用户是否有未支付的占桩订单失败"), + CODE_GET_MEMBER_CAR_NO_INFO_ERROR("00100064", "通过 memberId 查询用户绑定车牌信息失败"), /* 个人桩 start */