From 752279025786f1ea0292b66e77767fed330b78a5 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 24 八月 2024 16:45:56 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile --- ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java index 6bf4791..3745fd9 100644 --- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java +++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java @@ -424,6 +424,7 @@ for (TAppUserIntegralChange record : page.getRecords()) { record.setDateTime(record.getCreateTime()); + record.setUid(record.getId().toString()); if (record.getChangeType()==2){ R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension())); if (tChargingOrderR.getData()!=null) { @@ -440,6 +441,13 @@ return R.ok(page); + } + + @ApiOperation(value = "积分详情", tags = {"小程序-个人中心"}) + @GetMapping(value = "/user/points/detail") + public R<TAppUserIntegralChange> pointsDetail(String id) { + TAppUserIntegralChange byId = integralChangeService.getById(id); + return R.ok(byId); } @ApiOperation(value = "冻结解冻用户", tags = {"后台-用户管理-用户列表"}) @@ -809,6 +817,12 @@ return R.ok(); } + @ApiOperation(value = "添加编辑车辆", tags = {"小程序-个人中心-车辆"}) + @DeleteMapping(value = "/user/car/delete") + public R carDelete(String id) { + boolean b = appUserCarService.removeById(id); + return R.ok(); + } @ApiOperation(value = "车辆详情", tags = {"小程序-个人中心-车辆"}) @GetMapping(value = "/user/car/detail") public R<TAppUserCar> carDetail(String id) { -- Gitblit v1.7.1