From 163aee1c38d062f1f3e6e80ce23487cba5014839 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 17:01:19 +0800
Subject: [PATCH] 激活状态修改

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java |    9 +++------
 1 files changed, 3 insertions(+), 6 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..602af4b 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
@@ -420,8 +420,9 @@
 
 			Integer stateActivated = userCouponVO.getStateActivated();
 			if (stateActivated == null || stateActivated == 0) {
-				userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲�
 				userCouponVO.setState(0);
+				userCouponVO.setCouponEffect("寰呮縺娲�");
+				userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
 			} else {
 				userCouponVO.setCouponPicture(systemCoupon.getPicture());
 			}
@@ -1097,7 +1098,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 +1143,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