From 5df71ce306067c00a02e712433f7c8cf2be339c7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 09 一月 2025 16:13:36 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java | 81 +++++++++++++++++++++++++++++++++-------
1 files changed, 66 insertions(+), 15 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 fca9ac4..d808e07 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
@@ -505,7 +505,7 @@
}
@RequiresPermissions(value = {"/appUser/select", "/vipList/select"}, logical = Logical.OR)
- @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表","小程序-个人中心"})
+ @ApiOperation(value = "用户详情积分明细", tags = {"后台-用户管理-用户列表"})
@PostMapping(value = "/user/points/page")
public R<Page<TAppUserIntegralChange>> pointsDetail(@RequestBody PointsQueryDto pointsQueryDto) {
if (pointsQueryDto.getUserId()==null){
@@ -554,6 +554,59 @@
return R.ok(page);
}
+
+
+
+ @ApiOperation(value = "用户详情积分明细", tags = {"小程序-个人中心"})
+ @PostMapping(value = "/user/points/page1")
+ public R<Page<TAppUserIntegralChange>> pointsDetail1(@RequestBody PointsQueryDto pointsQueryDto) {
+ if (pointsQueryDto.getUserId()==null){
+ pointsQueryDto.setUserId(tokenService.getLoginUserApplet().getUserId());
+ }
+ List<Integer> types = new ArrayList<>();
+ if (pointsQueryDto.getType()==null){
+ types.add(1);
+ types.add(2);
+ types.add(3);
+ types.add(4);
+ types.add(5);
+ types.add(6);
+ }else if (pointsQueryDto.getType()==1){
+ types.add(1);
+ types.add(2);
+ types.add(3);
+ types.add(4);
+ types.add(5);
+ }else if (pointsQueryDto.getType()==2){
+ types.add(6);
+ }
+ Page<TAppUserIntegralChange> page = integralChangeService.lambdaQuery()
+ .eq(TAppUserIntegralChange::getAppUserId, pointsQueryDto.getUserId())
+ .orderByDesc(TAppUserIntegralChange::getCreateTime)
+ .eq(pointsQueryDto.getChangeType() != null, TAppUserIntegralChange::getChangeType, pointsQueryDto.getChangeType())
+ .in(!types.isEmpty(), TAppUserIntegralChange::getChangeType, types).page(Page.of(pointsQueryDto.getPageCurr(), pointsQueryDto.getPageSize()));
+
+ for (TAppUserIntegralChange record : page.getRecords()) {
+ record.setDateTime(record.getCreateTime());
+ record.setUid(record.getId().toString());
+ if (record.getChangeType()==2||record.getChangeType()==3){
+ R<TChargingOrder> tChargingOrderR = chargingOrderClient.orderDetail(Long.valueOf(record.getExtension()));
+ if (tChargingOrderR.getData()!=null) {
+ record.setOrderNum(tChargingOrderR.getData().getCode());
+ }
+ }
+ if (record.getChangeType()==6){
+ R<TExchangeOrder> tExchangeOrderR = exchangeOrderClient.orderDetail(Long.valueOf(record.getExtension()));
+ if (tExchangeOrderR.getData()!=null){
+ record.setOrderNum(tExchangeOrderR.getData().getCode());
+ }
+ }
+ }
+
+ return R.ok(page);
+
+ }
+
@ApiOperation(value = "积分详情", tags = {"小程序-个人中心"})
@GetMapping(value = "/user/points/detail")
@@ -1067,43 +1120,41 @@
if (count==0){
R<TIntegralRule> set = integralRuleClient.getSet();
TIntegralRule data = set.getData();
- JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
-
-
- Integer point = 0;
- //增加车牌50分，必填
+ if(null != data){
+ JSONObject jsonObject = JSON.parseObject(data.getAddVehiclesEarnsPoints());
+ Integer point = 0;
+ //增加车牌50分，必填
point = point+jsonObject.getInteger("num1");
if (doubleVip){
point = point+jsonObject.getInteger("num1");
}
- //增加车型分
+ //增加车型分
if (StringUtils.isNotEmpty(appUserCar.getVehicleModel())){
point = point+jsonObject.getInteger("num2");
if (doubleVip){
point = point+jsonObject.getInteger("num2");
}
}
- //增加车辆用途分
+ //增加车辆用途分
if (StringUtils.isNotEmpty(appUserCar.getVehicleUse())){
point = point+jsonObject.getInteger("num3");
if (doubleVip){
point = point+jsonObject.getInteger("num3");
}
}
- //增加续航分
+ //增加续航分
if (StringUtils.isNotEmpty(appUserCar.getEndurance())){
point = point+jsonObject.getInteger("num4");
if (doubleVip){
point = point+jsonObject.getInteger("num4");
}
}
-
- //增加积分记录
- pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"","");
- byId.setPoints(byId.getPoints()+point);
+
+ //增加积分记录
+ pointDetailUtil.addDetail(byId.getPoints(),byId.getPoints()+point,5,userId,appUserCar.getLicensePlate(),"","");
+ byId.setPoints(byId.getPoints()+point);
+ }
byId.setFirstAdd(1);
-
-
}
CarNumDto carNumDto = CarUtil.carNum(appUserCar.getLicensePlate());
if (carNumDto==null){
--
Gitblit v1.7.1