From f877016b46d8b76ef445a4ac337f8eae66b882be Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 四月 2019 15:48:24 +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, 4 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 0df0c57..463116b 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
@@ -282,7 +282,9 @@
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+ // 娲诲姩棰嗗彇鍒�
+ receivedCoupon(uid);
+
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
@@ -546,7 +548,7 @@
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
// 娲诲姩棰嗗彇鍒�
-// receivedCoupon(uid);
+ receivedCoupon(uid);
// 璁㈠崟鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
--
Gitblit v1.8.0