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 f6e7cf0b9..bc775c6b8 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 @@ -192,10 +192,10 @@ public class MemberController extends BaseController { try { String memberId = getMemberIdByAuthorization(request); dto.setMemberId(memberId); - // PageResponse pageResponse = memberService.getMemberBalanceChanges(dto); + PageResponse pageResponse = memberService.getMemberBalanceChanges(dto); // PageResponse pageResponse = memberService.getMemberWalletLog(dto); - MemberWalletInfoVO memberWalletInfo = memberService.getMemberWalletInfo(dto); - response = new RestApiResponse<>(memberWalletInfo); + // MemberWalletInfoVO memberWalletInfo = memberService.getMemberWalletInfo (dto); + response = new RestApiResponse<>(pageResponse); } catch (Exception e) { logger.error("查询用户账户余额变动信息 error:", e); response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_BALANCE_CHANGES_ERROR); @@ -205,6 +205,32 @@ public class MemberController extends BaseController { } + /** + * 获取用户账户余额变动信息V2 + * http://localhost:8080/uniapp/member/getMemberBalanceChangesV2 + * @param request + * @param dto + * @return + */ + @PostMapping("/getMemberBalanceChangesV2") + public RestApiResponse getMemberBalanceChangesV2(HttpServletRequest request, @RequestBody UniAppQueryMemberBalanceDTO dto) { + logger.info("查询用户账户余额变动信息 params:{}", JSON.toJSONString(dto)); + RestApiResponse response = null; + try { + String memberId = getMemberIdByAuthorization(request); + dto.setMemberId(memberId); + // PageResponse pageResponse = memberService.getMemberBalanceChanges(dto); + // PageResponse pageResponse = memberService.getMemberWalletLog(dto); + MemberWalletInfoVO memberWalletInfo = memberService.getMemberWalletInfo (dto); + response = new RestApiResponse<>(memberWalletInfo); + } catch (Exception e) { + logger.error("查询用户账户余额变动信息 error:", e); + response = new RestApiResponse<>(ReturnCodeEnum.CODE_GET_BALANCE_CHANGES_ERROR); + } + logger.info("查询用户账户余额变动信息 result:{}", response); + return response; + } + /** * 通过 memberId 查询用户绑定车牌信息 * http://localhost:8080/uniapp/member/getMemberCarNoInfo