From 9eeb0c5682c28802736a6c4a2de1ccaf061dd053 Mon Sep 17 00:00:00 2001
From: "1350250847@qq.com" <Xm@124578>
Date: Mon, 27 Apr 2026 17:45:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E6=B4=BB=E5=8A=A8=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AE=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ShopFlashSaleActivityController.java    |  6 +++---
 .../shop/service/ShopFlashSaleActivityService.java     |  6 +++---
 .../service/impl/ShopFlashSaleActivityServiceImpl.java | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java
index 47fdde5..dc2e0c9 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopFlashSaleActivityController.java
@@ -59,7 +59,7 @@ public class ShopFlashSaleActivityController extends BaseController {
 //    @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')")
     @Operation(summary = "根据id查询秒杀活动")
     @GetMapping("/{id}")
-    public ApiResult<ShopFlashSaleActivity> get(@PathVariable("id") Long id) {
+    public ApiResult<ShopFlashSaleActivity> get(@PathVariable("id") Integer id) {
         // 使用关联查询
         return success(shopFlashSaleActivityService.getByIdRel(id));
     }
@@ -95,7 +95,7 @@ public class ShopFlashSaleActivityController extends BaseController {
     @OperationLog
     @Operation(summary = "开启/关闭秒杀活动状态")
     @PutMapping("/updateStatus")
-    public ApiResult<?> updateStatus(@RequestParam("id") Long id) {
+    public ApiResult<?> updateStatus(@RequestParam("id") Integer id) {
         return success(shopFlashSaleActivityService.updateStatus(id));
     }
 
@@ -105,7 +105,7 @@ public class ShopFlashSaleActivityController extends BaseController {
             @Parameter(name = "id", description = "活动ID", required = true, example = "1"),
             @Parameter(name = "sortNumber", description = "排序", required = true, example = "2")
     })
-    public ApiResult<?> updateSortNumber(@RequestParam("id") Long id, @RequestParam("sortNumber") Integer sortNumber) {
+    public ApiResult<?> updateSortNumber(@RequestParam("id") Integer id, @RequestParam("sortNumber") Integer sortNumber) {
         return success(shopFlashSaleActivityService.updateSortNumber(id, sortNumber));
     }
 
diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java
index b3e17af..eee7133 100644
--- a/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java
+++ b/src/main/java/com/gxwebsoft/shop/service/ShopFlashSaleActivityService.java
@@ -38,7 +38,7 @@ public interface ShopFlashSaleActivityService extends IService<ShopFlashSaleActi
      * @param id 秒杀活动编号
      * @return ShopFlashSaleActivity
      */
-    ShopFlashSaleActivity getByIdRel(Long id);
+    ShopFlashSaleActivity getByIdRel(Integer id);
 
     /**
      * 查询个人可参与的活动数据
@@ -52,7 +52,7 @@ public interface ShopFlashSaleActivityService extends IService<ShopFlashSaleActi
      * @param id
      * @return
      */
-    Boolean updateStatus(Long id);
+    Boolean updateStatus(Integer id);
 
     /**
      * 修改秒杀活动排序
@@ -60,6 +60,6 @@ public interface ShopFlashSaleActivityService extends IService<ShopFlashSaleActi
      * @param sortNumber
      * @return
      */
-    Boolean updateSortNumber(Long id, Integer sortNumber);
+    Boolean updateSortNumber(Integer id, Integer sortNumber);
 
 }
diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java
index 6819dd3..b6f16aa 100644
--- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java
+++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopFlashSaleActivityServiceImpl.java
@@ -72,7 +72,7 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl<ShopFlashSaleA
     }
 
     @Override
-    public ShopFlashSaleActivity getByIdRel(Long id) {
+    public ShopFlashSaleActivity getByIdRel(Integer id) {
         ShopFlashSaleActivityParam param = new ShopFlashSaleActivityParam();
         param.setId(id);
         return param.getOne(baseMapper.selectListRel(param));
@@ -100,10 +100,10 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl<ShopFlashSaleA
         LambdaQueryChainWrapper<ShopFlashSaleActivity> activityWrapper = lambdaQuery().eq(ShopFlashSaleActivity::getStatus, 0).gt(ShopFlashSaleActivity::getStock, 0).eq(ShopFlashSaleActivity::getTenantId, tenantId)
                 .apply("NOW() BETWEEN start_time AND end_time");
 
-        Map<Long, Integer> activityMap = new HashMap<>();
+        Map<Integer, Integer> activityMap = new HashMap<>();
         if(!newUser){
             //查询当前用户是否有下过秒杀活动订单数据【判断下单数量是否超过限制】
-            List<Long> activityIdList = activityWrapper.list().stream().map(ShopFlashSaleActivity::getId).collect(Collectors.toList());
+            List<Integer> activityIdList = activityWrapper.list().stream().map(ShopFlashSaleActivity::getId).collect(Collectors.toList());
             LambdaQueryWrapper<ShopOrder> shopOrderWrapper = new LambdaQueryWrapper<ShopOrder>().select(ShopOrder::getOrderId, ShopOrder::getActivityId, ShopOrder::getTotalNum)
                     .eq(ShopOrder::getUserId, loginUser.getUserId()).in(ShopOrder::getActivityId, activityIdList).in(ShopOrder::getOrderStatus, Arrays.asList(0, 1));
             activityMap = shopOrderMapper.selectList(shopOrderWrapper).stream().collect(Collectors.groupingBy(ShopOrder::getActivityId, Collectors.summingInt(ShopOrder::getTotalNum)));
@@ -143,7 +143,7 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl<ShopFlashSaleA
     }
 
     @Override
-    public Boolean updateStatus(Long id) {
+    public Boolean updateStatus(Integer id) {
         ShopFlashSaleActivity saleActivity = baseMapper.selectById(id);
         if(saleActivity != null){
             if (saleActivity.getStatus() == 0){
@@ -164,7 +164,7 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl<ShopFlashSaleA
     }
 
     @Override
-    public Boolean updateSortNumber(Long id, Integer sortNumber) {
+    public Boolean updateSortNumber(Integer id, Integer sortNumber) {
         ShopFlashSaleActivity saleActivity = baseMapper.selectById(id);
         if(saleActivity != null){
             saleActivity.setSortNumber(sortNumber);