From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
index 5828cfa..b6df19e 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserActivityBalanceServiceImpl.java
@@ -4,6 +4,7 @@
import com.stylefeng.guns.modular.system.dao.UserActivityBalanceMapper;
import com.stylefeng.guns.modular.system.model.UserActivityBalance;
import com.stylefeng.guns.modular.system.service.IUserActivityBalanceService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -28,7 +29,18 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> query(Double money, Integer companyId) throws Exception {
- return userActivityBalanceMapper.query(money, companyId);
+ public List<Map<String, Object>> query(Integer language, Double money, Integer companyId) throws Exception {
+ List<Map<String, Object>> query = userActivityBalanceMapper.query(money, companyId);
+ for (Map<String, Object> map : query) {
+ if(null != map.get("startTime")){
+ String startTime = map.get("startTime").toString();
+ map.put("startTime", DateUtil.conversionFormat(language, startTime));
+ }
+ if(null != map.get("endTime")){
+ String endTime = map.get("endTime").toString();
+ map.put("endTime", DateUtil.conversionFormat(language, endTime));
+ }
+ }
+ return query;
}
}
--
Gitblit v1.7.1