From 6a90f2d1feaf583c211d5f9fe95dff7f7c748ed3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 06 九月 2024 17:42:20 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java index f07c287..9f651c7 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserCouponRecordServiceImpl.java @@ -4,6 +4,7 @@ import com.stylefeng.guns.modular.system.dao.UserCouponRecordMapper; import com.stylefeng.guns.modular.system.model.UserCouponRecord; import com.stylefeng.guns.modular.system.model.UserInfo; +import com.stylefeng.guns.modular.system.service.ISystemNoticeService; import com.stylefeng.guns.modular.system.service.IUserCouponRecordService; import com.stylefeng.guns.modular.system.service.IUserInfoService; import com.stylefeng.guns.modular.system.util.DateUtil; @@ -24,6 +25,12 @@ @Autowired private IUserInfoService userInfoService; + + @Resource + private ISystemNoticeService systemNoticeService; + + + /** @@ -112,6 +119,9 @@ public ResultUtil handselCoupon(Integer id, Integer uid, Integer userId, Integer language) throws Exception { UserCouponRecord userCouponRecord = userCouponRecordMapper.selectById(id); language = userInfoService.queryLanguage(uid, language); + UserInfo userInfo1 = userInfoService.selectById(uid); + String nickName = userInfo1.getNickName(); + String phone = userInfo1.getPhone(); if(userCouponRecord.getUserId().compareTo(uid) != 0){ return ResultUtil.error(language == 1 ? "您不能赠送此优惠券" : language == 2 ? "You cannot gift the coupon." : "Vous ne pouvez pas offrir le coupon."); } @@ -120,6 +130,11 @@ } userCouponRecord.setUserId(userId); userCouponRecordMapper.updateById(userCouponRecord); + UserInfo userInfo = userInfoService.selectById(userId); + Integer language1 = userInfo.getLanguage(); + systemNoticeService.addSystemNotice(1, language1 == 1 ? nickName + "(" + phone + ")刚赠送您了一张GHS 5.00的优惠券,请查看账户。" : language1 == 2 + ? nickName + "(" + phone + ")just gifted a GHS 5.00 coupon to you, please check your account." + : nickName + "(" + phone + ")vient de vous offrir un coupon de GHS 5.00, veuillez vérifier votre compte.", userId, 1); return ResultUtil.success(); } -- Gitblit v1.7.1