From 2d3c9a4fee4ef926fe0674c6f8bea4a52595bffb Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期二, 27 八月 2024 10:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 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 a7401eb..776fb34 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
@@ -116,7 +116,20 @@
private TInviteUserService inviteUserService;
-
+ /**
+ * 远程调用 积分兑换订单 退款回退积分
+ * @return
+ */
+ @PostMapping(value = "/refundPoints/{param}")
+ public R refundPoints(@PathVariable("param")String param) {
+ String[] split = param.split("-");
+ String userId = split[0];
+ String points = split[1];
+ TAppUser byId = appUserService.getById(userId);
+ byId.setPoints(byId.getPoints()+Integer.parseInt(points));
+ appUserService.updateById(byId);
+ return R.ok();
+ }
@ApiOperation(value = "查询当前用户是否为会员 0否1是", tags = {"小程序--查询当前用户是否为会员"})
@PostMapping(value = "/getUserInfo")
@@ -510,6 +523,7 @@
tAppUserCar.setUid(tAppUserCar.getId().toString());
}
appUserInfoDto.setUserCars(list);
+ appUserInfoDto.setFirstAdd(byId.getFirstAdd()!=null?byId.getFirstAdd():0);
return R.ok(appUserInfoDto);
@@ -602,7 +616,7 @@
@ApiOperation(value = "更换手机号", tags = {"小程序-用户管理-更换手机号"})
@PostMapping(value = "/user/updatePhone")
public AjaxResult<String> updatePhone(@Validated @RequestBody UpdatePhoneDTO dto) {
- String code = redisService.getCacheObject(dto.getPhone() + Constants.APPLET);
+ String code = redisService.getCacheObject(dto.getPhone() + Constants.UPDATE_PHONE);
if(StringUtils.isEmpty(code)){
return AjaxResult.error("验证码已过期,请重新获取验证码!");
}
@@ -808,6 +822,7 @@
//增加积分记录
pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"");
byId.setPoints(byId.getPoints()+point);
+ byId.setFirstAdd(1);
appUserService.updateById(byId);
@@ -841,7 +856,7 @@
}
- @ApiOperation(value = "根据品牌获取车型", tags = {"小程序-个人中心-车辆"})
+ @ApiOperation(value = "根据品牌获取车系", tags = {"小程序-个人中心-车辆"})
@GetMapping(value = "/user/car/getModel")
public R getModel(String id) throws Exception {
String modelById = CarBrandUtil.getModelById(id);
@@ -855,5 +870,20 @@
}
return R.ok(backList);
}
+ @ApiOperation(value = "根据车系获取车型", tags = {"小程序-个人中心-车辆"})
+ @GetMapping(value = "/user/car/getSeries")
+ public R getSeries(String id) throws Exception {
+ String modelById = CarBrandUtil.getSeriesById(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