From cbf2486983b77a27af9968bbb362cb8d43789115 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 26 三月 2025 15:30:53 +0800
Subject: [PATCH] 修改统计bug和部分功能修改
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 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 466c116..9d5ca8d 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
@@ -124,10 +124,26 @@
}
@DeleteMapping("/deleteUserPointCopy")
- public R deleteUserPointCopy(@RequestParam Long orderId) {
- userPointCopyMapper.delete(new LambdaQueryWrapper<UserPointCopy>()
+ public R deleteUserPointCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type) {
+ userPointCopyMapper.delete(new LambdaQueryWrapper<UserPointCopy>().in(UserPointCopy::getType, type)
.eq(UserPointCopy::getObjectId, orderId));
return R.ok();
+ }
+
+
+
+ @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));
+ return R.ok(list);
}
@@ -167,13 +183,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