From 1f09f6daaf73bc83cceb4ae22b862b7b365635cf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 四月 2025 19:59:17 +0800
Subject: [PATCH] 修改反馈文档bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
index 84be6c3..ccc562b 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java
@@ -20,6 +20,7 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * <p>
@@ -75,13 +76,9 @@
     }
     @GetMapping("/statistics/list")
     @ApiOperation(value = "门店积分明细必传门店id", tags = {"后台"})
-    public R<Page<ShopPoint>> statisticslist(ShopPoint shopPoint,Integer pageNum,Integer pageSize) {
-        Page<ShopPoint> page = shopPointService.lambdaQuery()
-                .eq(ShopPoint::getShopId, shopPoint.getShopId())
-                .eq(shopPoint.getType()!=null && shopPoint.getType()!=0,ShopPoint::getType, shopPoint.getType())
-                .like(shopPoint.getOrderNum()!=null,ShopPoint::getOrderNum, shopPoint.getOrderNum())
-                .orderByDesc(ShopPoint::getCreateTime)
-                .page(Page.of(pageNum, pageSize));
+    public R<IPage<ShopPoint>> statisticslist(ShopPoint shopPoint,Integer pageNum,Integer pageSize) {
+        IPage<ShopPoint> page = shopPointService.getShopPointPage(Page.of(pageNum, pageSize), shopPoint);
+        page.getRecords().forEach(s->s.setVariablePoint(s.getVariablePoint() * s.getChangeDirection()));
         return R.ok(page);
     }
 
@@ -119,11 +116,25 @@
         shopPointCopyMapper.insert(shopPoint);
     }
 
-    @DeleteMapping("/shop-point/deleteShopPointCopy")
-    public void deleteShopPointCopy(@RequestParam("orderId") Long orderId){
-        shopPointCopyMapper.delete(new LambdaQueryWrapper<ShopPointCopy>()
+    @DeleteMapping("/deleteShopPointCopy")
+    public void deleteShopPointCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type){
+        shopPointCopyMapper.delete(new LambdaQueryWrapper<ShopPointCopy>().in(ShopPointCopy::getType, type)
                 .eq(ShopPointCopy::getObjectId, orderId));
     }
+    
+    
+    @DeleteMapping("/deleteShopPointCopyByIds")
+    public void deleteShopPointCopyByIds(@RequestParam("ids") List<Long> ids){
+        shopPointCopyMapper.deleteBatchIds(ids);
+    }
+    
+    
+    @PostMapping("/getShopPointCopy")
+    public R<List<ShopPointCopy>> getShopPointCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type){
+        List<ShopPointCopy> shopPointCopies = shopPointCopyMapper.selectList(new LambdaQueryWrapper<ShopPointCopy>().in(ShopPointCopy::getType, type)
+                .eq(ShopPointCopy::getObjectId, orderId));
+        return R.ok(shopPointCopies);
+    }
 
 }
 

--
Gitblit v1.7.1