Merge remote-tracking branch 'origin/master'

yujian

2019-03-06 7c3277e2b1255d5948fb3c542db1ba5aff8ad0e1

 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();