From 9eea52a9d14344a3e287368dd2dc28967363b3b5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 24 八月 2024 16:14:34 +0800
Subject: [PATCH] 8.24
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 432ccae..6bf4791 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
@@ -405,6 +405,9 @@
@ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表","小程序-个人中心"})
@PostMapping(value = "/user/points/page")
public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) {
+ if (pointsQueryDto.getUserId()==null){
+ pointsQueryDto.setUserId(tokenService.getLoginUserApplet().getUserId());
+ }
List<Integer> types = new ArrayList<>();
if (pointsQueryDto.getType()!=null){
types.add(1);
@@ -420,6 +423,7 @@
.in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
for (TAppUserIntegralChange record : page.getRecords()) {
+ record.setDateTime(record.getCreateTime());
if (record.getChangeType()==2){
R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
if (tChargingOrderR.getData()!=null) {
@@ -494,6 +498,9 @@
appUserInfoDto.setCouponNum(Math.toIntExact(coupons));
//当前绑定的车辆
List<TAppUserCar> list = carService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).list();
+ for (TAppUserCar tAppUserCar : list) {
+ tAppUserCar.setUid(tAppUserCar.getId().toString());
+ }
appUserInfoDto.setUserCars(list);
return R.ok(appUserInfoDto);
@@ -685,7 +692,7 @@
//签到加积分记录
R<TIntegralRule> set = integralRuleClient.getSet();
TIntegralRule data = set.getData();
- JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+ JSONObject jsonObject = JSON.parseObject(data.getSignInForPoints());
//增加每日积分
Integer points = 0;
Integer point = jsonObject.getInteger("num1");
@@ -761,7 +768,7 @@
LoginUserApplet loginUserApplet = tokenService.getLoginUserApplet();
Long userId = loginUserApplet.getUserId();
TAppUser byId = appUserService.getById(userId);
-
+ appUserCar.setAppUserId(userId);
//如果是第一次添加车辆，增加积分
Long count = appUserCarService.lambdaQuery().eq(TAppUserCar::getAppUserId, userId).count();
@@ -802,12 +809,36 @@
return R.ok();
}
+ @ApiOperation(value = "车辆详情", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/detail")
+ public R<TAppUserCar> carDetail(String id) {
+ TAppUserCar byId = appUserCarService.getById(id);
+ return R.ok(byId);
+ }
@ApiOperation(value = "获取车辆品牌", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getBrands")
- public R getBrands() throws Exception {
+ public R getBrands(String name) throws Exception {
String brand = CarBrandUtil.getBrand();
- return R.ok(brand);
+ JSONObject jsonObject = JSON.parseObject(brand);
+ JSONArray data = jsonObject.getJSONArray("data");
+ return R.ok(data);
+
+ }
+
+ @ApiOperation(value = "根据品牌获取车型", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/getModel")
+ public R getModel(String id) throws Exception {
+ String modelById = CarBrandUtil.getModelById(id);
+ JSONObject jsonObject = JSON.parseObject(modelById);
+ JSONArray data = jsonObject.getJSONArray("data");
+ JSONArray backList = new JSONArray();
+ for (Object datum : data) {
+ JSONObject jsonObject1 = JSON.parseObject(datum.toString());
+ JSONArray list = jsonObject1.getJSONArray("list");
+ backList.addAll(list);
+ }
+ return R.ok(backList);
}
}
--
Gitblit v1.7.1