From 199861555473ab50f2fafa3d58e42e64e838c039 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期一, 24 二月 2025 22:47:18 +0800
Subject: [PATCH] 修改物流信息导入模板

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopPointController.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 50fc680..84be6c3 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
@@ -1,12 +1,15 @@
 package com.ruoyi.other.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.other.api.domain.ShopPoint;
+import com.ruoyi.other.api.domain.ShopPointCopy;
+import com.ruoyi.other.mapper.ShopPointCopyMapper;
 import com.ruoyi.other.service.ShopPointService;
 import com.ruoyi.other.vo.ShopPointStatistics;
 import com.ruoyi.system.api.domain.SysUser;
@@ -32,6 +35,8 @@
 public class ShopPointController {
     @Resource
     private ShopPointService shopPointService;
+    @Resource
+    private ShopPointCopyMapper shopPointCopyMapper;
     @Resource
     private TokenService tokenService;
     @Resource
@@ -71,7 +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, shopPoint.getType())
+        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));
@@ -103,5 +110,20 @@
         shopPointService.save(shopPoint);
     }
 
+    /**
+     * 保存门店积分流水
+     * @param shopPoint
+     */
+    @PostMapping("/saveShopPointCopy")
+    public void saveShopPointCopy(@RequestBody ShopPointCopy shopPoint){
+        shopPointCopyMapper.insert(shopPoint);
+    }
+
+    @DeleteMapping("/shop-point/deleteShopPointCopy")
+    public void deleteShopPointCopy(@RequestParam("orderId") Long orderId){
+        shopPointCopyMapper.delete(new LambdaQueryWrapper<ShopPointCopy>()
+                .eq(ShopPointCopy::getObjectId, orderId));
+    }
+
 }
 

--
Gitblit v1.7.1