From 17b48b4731e2ac2b6d571049718be724eb31972b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 19 三月 2025 20:52:35 +0800
Subject: [PATCH] 充电桩bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index 3665af1..b52b3f8 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -103,9 +103,8 @@
PageInfo<TActivityStatisticslVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
- PageInfo<TActivityStatisticslVO> pageInfo1 = new PageInfo<>(1,9999999);
List<TActivityStatisticslVO> list = this.baseMapper.activityStatistics(pageInfo,dto);
- List<TActivityStatisticslVO> list1 = this.baseMapper.activityStatistics(pageInfo1,dto);
+ List<TActivityStatisticslVO> list1 = this.baseMapper.activityStatisticsNolimit(dto);
// 优惠券金额
BigDecimal coupon = new BigDecimal("0");
@@ -179,9 +178,9 @@
tActivityStatisticslVO.setType("赠送会员");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}else{
- // 赠送
- grantVip = grantVip.add(tActivityStatisticslVO.getVipDiscountAmount());
- tActivityStatisticslVO.setType("赠送会员");
+ // 会员活动
+ vipActivity = vipActivity.add(tActivityStatisticslVO.getVipDiscountAmount());
+ tActivityStatisticslVO.setType("会员活动");
tActivityStatisticslVO.setTime(tActivityStatisticslVO.getCreateTime());
}
break;
--
Gitblit v1.7.1