From 7c3277e2b1255d5948fb3c542db1ba5aff8ad0e1 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 13 ++-----------
1 files changed, 2 insertions(+), 11 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 b064408..4563ced 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
@@ -47,8 +47,6 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.push.PushCouponRecordService;
-import com.yeshi.fanli.service.inter.push.PushCouponService;
import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -129,13 +127,6 @@
@Resource
private CommonOrderCountService commonOrderCountService;
-
- @Resource
- private PushCouponService pushCouponService;
-
- @Resource
- private PushCouponRecordService pushCouponRecordService;
-
@Override
public int insertSelective(UserSystemCoupon record) {
@@ -530,7 +521,7 @@
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
// 娲诲姩棰嗗彇鍒�
- receivedCoupon(uid);
+// receivedCoupon(uid);
// 璁㈠崟鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
@@ -560,7 +551,7 @@
sendBackTimeOutCoupon(uid);
// 娲诲姩棰嗗彇鍒�
- receivedCoupon(uid);
+// receivedCoupon(uid);
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
--
Gitblit v1.8.0