From 25a398c9a5f865b4f02309ec984a544972fc62c2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:30:13 +0800
Subject: [PATCH] 退回消息调整

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
index 8f11e8e..169bb92 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -2122,13 +2122,17 @@
 			if (systemCoupon == null)
 				continue;
 			
+			String couponName = systemCoupon.getName();
+			if (CouponTypeEnum.freeCouponGive == systemCoupon.getType())
+				couponName = "鍏嶅崟鍒�";
+			
 			// 閫�鍥炴秷鎭�
 			String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績鏌ョ湅";
 			SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
 			MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();
 			msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);
-			msgOther.setTitle("璧犻��" + systemCoupon.getName() + "閫�鍥�");
-			msgOther.setGiveType("浣犺禒閫佺殑"+ systemCoupon.getName() + "鏈鎴愬姛棰嗗彇");
+			msgOther.setTitle("璧犻��" + couponName + "閫�鍥�");
+			msgOther.setGiveType("浣犺禒閫佺殑"+ couponName + "鏈鎴愬姛棰嗗彇");
 			msgOther.setGiveTime(sd.format(record.getGiveTime()));
 			msgOther.setReturnTime(sd.format(new Date()));
 			userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);

--
Gitblit v1.8.0