From 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 4 ++--
1 files changed, 2 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 4ed2839..502436e 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
@@ -601,7 +601,7 @@
// 娑堟伅鎺ㄩ��
try {
if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);
+// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
@@ -1236,7 +1236,7 @@
// 鍒稿凡浣跨敤
userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
} else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
}
--
Gitblit v1.8.0