From 0001861cc63fc670646a103284b9eaefb193e91f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 10 八月 2024 17:31:48 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
index 2c0b66c..b2ba489 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java
@@ -6,9 +6,7 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.system.model.TEmail;
-import com.stylefeng.guns.modular.system.model.TOrderCharter;
-import com.stylefeng.guns.modular.system.model.TUser;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import org.jsoup.Jsoup;
@@ -23,7 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
-import com.stylefeng.guns.modular.system.model.TIntegralOrder;
import javax.annotation.Resource;
import java.io.File;
@@ -57,6 +54,9 @@
@Resource
private ITSystemNoticeService systemNoticeService;
+
+ @Resource
+ private ITIntegralGoodsService integralGoodsService;
@@ -124,11 +124,12 @@
tIntegralOrderService.updateById(tIntegralOrder);
TIntegralOrder tIntegralOrder1 = tIntegralOrderService.selectById(tIntegralOrder.getId());
TUser tUser = userService.selectById(tIntegralOrder1.getUserId());
+ TIntegralGoods tIntegralGoods = integralGoodsService.selectById(tIntegralOrder.getGoodsId());
try {
Integer language = tUser.getLanguage();
- systemNoticeService.addSystemNotice(1, language == 1 ? "您的积分兑换请求已通过审核，平台客服将会联系您，请耐心等待！" :
- language == 2 ? "Your points redemption request has been approved, and I-GO customer service will contact you. Please be patient!" :
- "Votre demande d’échange de points a été approuvée et le service client d’I-GO vous contactera. Soyez patient !", tIntegralOrder.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您使用" + tIntegralOrder.getIntegral() + "积分成功兑换" + tIntegralGoods.getName() :
+ language == 2 ? "You redeemed " + tIntegralOrder.getIntegral() + " points for the " + tIntegralGoods.getName() + " successfully" :
+ "Vous avez échangé " + tIntegralOrder.getIntegral() + " points avec succès contre le " + tIntegralGoods.getName() + "", tIntegralOrder.getUserId());
} catch (Exception e) {
throw new RuntimeException(e);
}
--
Gitblit v1.7.1