From dcd5d07d5d648b48f6f04cd79b6e8c5b780dcff7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 二月 2019 16:59:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 6 +-----
1 files changed, 1 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 12563d1..8adeccd 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
@@ -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;
--
Gitblit v1.8.0