From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IntegralOrderServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IntegralOrderServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IntegralOrderServiceImpl.java
index b8cea84..18ca615 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IntegralOrderServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IntegralOrderServiceImpl.java
@@ -9,6 +9,7 @@
import com.stylefeng.guns.modular.system.service.IIntegralOrderService;
import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
+import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -52,7 +53,7 @@
return ResultUtil.error(language == 1 ? "兑换失败，积分不足！":(language == 2 ? "Redemption failed， insufficient points！":"Échange échoué， points insuffisants！"));
}
integralOrder.setInsertTime(new Date());
- integralGoods.setIntegral(integralGoods.getIntegral());
+ integralOrder.setIntegral(integralGoods.getIntegral());
integralOrder.setNum(1);
integralOrder.setState(1);
integralOrder.setUserId(uid);
@@ -83,8 +84,27 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryConvertHistory(Integer pageNum, Integer size, Integer uid) throws Exception {
+ public List<Map<String, Object>> queryConvertHistory(Integer pageNum, Integer size, Integer uid,Integer language) throws Exception {
pageNum = (pageNum - 1) * size;
- return integralOrderMapper.queryConvertHistory(pageNum, size, uid);
+ List<Map<String, Object>> list = integralOrderMapper.queryConvertHistory(pageNum, size, uid);
+ for (Map<String, Object> map : list) {
+ if(null != map.get("integral") && !"".equals(map.get("integral"))){
+ String integral = String.valueOf(map.get("integral"));
+ if(language == 1){
+ integral = integral + "积分";
+ }else{
+ // 积分的英语与法语翻译一致
+ integral = integral + " points";
+ }
+ map.put("integral",integral);
+ }
+
+ if(null != map.get("time")){
+ String time = map.get("time").toString();
+ map.put("time", DateUtil.conversionFormat(language, time));
+ }
+
+ }
+ return list;
}
}
--
Gitblit v1.7.1