From 7d294e1e04095eb4f1c0807406d1ccb8461850cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 18:24:20 +0800
Subject: [PATCH] 券消息修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 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 12563d1..25684d4 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
@@ -570,7 +570,7 @@
// 娑堟伅鎺ㄩ��
try {
if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);
+// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
@@ -1097,7 +1097,7 @@
@Override
public void sendBackTimeOutCoupon(Long uid) {
// 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120);
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);
if (list == null || list.size() == 0) {
return;
}
@@ -1142,10 +1142,6 @@
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
Long auctionId) throws Exception{
-
- //鍙鐞嗕粯娆鹃噾棰濆皬浜�10鐨�
- if(payment==null||payment.compareTo(new BigDecimal(10))<0)
- return false;
boolean isfree = false;
@@ -1209,7 +1205,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