From d849e3a1abb07f459d6394adc6b69e7c6e7aeb63 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 28 二月 2019 10:08:08 +0800
Subject: [PATCH] 券消息修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 502436e..34ca787 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
@@ -220,7 +220,7 @@
} else if (coupon.getType() != CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
} else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
- userOtherMsgNotificationService.rewardCouponGet(userCoupon);
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());
}
} catch(Exception e) {
@@ -603,7 +603,7 @@
if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
+// userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
} catch(Exception e) {
@@ -718,7 +718,7 @@
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
} catch(Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -1234,11 +1234,11 @@
SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (baseCoupon == null) {
// 鍒稿凡浣跨敤
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);
} else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);
}
}
}
--
Gitblit v1.8.0