From e7a4c604b4703caf135ec3d360106e7cf028cc89 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 27 三月 2025 00:45:08 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index 81a790b..618aa6b 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -54,9 +54,7 @@
@Resource
private UserPointCopyMapper userPointCopyMapper;
@Resource
- private AppUserService appUserService;
- @Resource
- private TokenService tokenService;
+ private OrderClient orderClient;
/**
@@ -131,7 +129,15 @@
}
- @DeleteMapping("/getUserPointCopy")
+
+ @DeleteMapping("/deleteUserPointCopyByIds")
+ public R deleteUserPointCopyByIds(@RequestParam("ids") List<Long> ids){
+ userPointCopyMapper.deleteBatchIds(ids);
+ return R.ok();
+ }
+
+
+ @PostMapping("/getUserPointCopy")
public R<List<UserPointCopy>> getUserPointCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type) {
List<UserPointCopy> list = userPointCopyMapper.selectList(new LambdaQueryWrapper<UserPointCopy>().in(UserPointCopy::getType, type)
.eq(UserPointCopy::getObjectId, orderId));
@@ -157,8 +163,6 @@
IPage<UserPoint> userPointPage = userPointService.getUserPointPage(Page.of(userPoint.getPageNum(), userPoint.getPageSize()), userPoint);
return R.ok(userPointPage);
}
- @Resource
- private OrderClient orderClient;
@GetMapping("/user/list")
@ApiOperation(value = "积分管理-用户积分明细(必传用户id)", tags = "后台")
@@ -175,13 +179,10 @@
record.setExtention(data.getOrderNumber());
}
}
- int i = record.getHistoricalPoint() - record.getBalance();
- if (i>0){
+ if (record.getChangeDirection() == -1){
record.setVariableType(2);
- }else if (i<0){
- record.setVariableType(1);
}else{
- record.setVariableType(0);
+ record.setVariableType(1);
}
}
return R.ok(page);
--
Gitblit v1.7.1