From 8b09fbc19a96b57bf1d0e4d7c79b51a76aeca554 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 28 三月 2025 19:57:56 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
index 8dd09b3..8950af1 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java
@@ -64,6 +64,10 @@
public Map<String, Object> getDiscountStatic(String beginTime, String endTime, Integer activityId) {
return this.baseMapper.getDiscountStatic(beginTime,endTime,activityId);
}
+ @Override
+ public Map<String, Object> getDiscountStatic1(String beginTime, String endTime, Integer activityId) {
+ return this.baseMapper.getDiscountStatic1(beginTime,endTime,activityId);
+ }
@Override
public List<Map<String, Object>> getBlanceList(Page<Map<String, Object>> page, String beginTime, String endTime, Integer activityId) {
@@ -385,15 +389,12 @@
list.add("通用券领取总数");
list.add("通用券使用总数");
list.add("通用券使用总金额");
- list.add("专车券领取总数");
- list.add("专车券使用总数");
- list.add("专车券使用总金额");
- list.add("出租车券领取总数");
- list.add("出租车券使用总数");
- list.add("出租车券使用总金额");
- list.add("跨城券领取总数");
- list.add("跨城券使用总数");
- list.add("跨城券使用总金额");
+ list.add("打车券领取总数");
+ list.add("打车券使用总数");
+ list.add("打车券使用总金额");
+ list.add("包裹券领取总数");
+ list.add("包裹券使用总数");
+ list.add("包裹券使用总金额");
lists.add(list);
List<List<List<String>>> lists1 = new ArrayList<>();
@@ -410,12 +411,9 @@
list2.add(null != map.get("zcNum") ? map.get("zcNum").toString() : "");
list2.add(null != map.get("zcUseNum") ? map.get("zcUseNum").toString() : "");
list2.add(null != map.get("zcUseMoney") ? map.get("zcUseMoney").toString() : "");
- list2.add(null != map.get("czcNum") ? map.get("czcNum").toString() : "");
- list2.add(null != map.get("czcUseNum") ? map.get("czcUseNum").toString() : "");
- list2.add(null != map.get("czcUseMoney") ? map.get("czcUseMoney").toString() : "");
- list2.add(null != map.get("kcNum") ? map.get("kcNum").toString() : "");
- list2.add(null != map.get("kcUseNum") ? map.get("kcUseNum").toString() : "");
- list2.add(null != map.get("kcUseMoney") ? map.get("kcUseMoney").toString() : "");
+ list2.add(null != map.get("xjNum") ? map.get("xjNum").toString() : "");
+ list2.add(null != map.get("xjUseNum") ? map.get("xjUseNum").toString() : "");
+ list2.add(null != map.get("xjUseMoney") ? map.get("xjUseMoney").toString() : "");
lists2.add(list2);
}
lists1.add(lists2);
--
Gitblit v1.7.1