From 02ece4ea308a26928dea57ca68f0585fef1d2e62 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 28 二月 2019 15:48:38 +0800
Subject: [PATCH] 券消息bug调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 05dce2a..468af7c 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
@@ -215,11 +215,11 @@
// 娑堟伅鎺ㄩ��
try {
- if (coupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponGet(userCoupon);
- } else if (coupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
- } else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());
}
@@ -618,9 +618,9 @@
// 娑堟伅鎺ㄩ��
try {
- if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
// userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
@@ -1129,11 +1129,11 @@
// 娑堟伅鎺ㄩ��
try {
- if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
- } else if (baseCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
}
@@ -1259,9 +1259,9 @@
if (baseCoupon == null) {
// 鍒稿凡浣跨敤
userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);
- } else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
- } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);
}
}
--
Gitblit v1.8.0