Merge remote-tracking branch 'origin/master'

admin

2019-03-06 55017f3ef6df7364853f224a7704cdc4417ca202

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java

@@ -519,7 +519,7 @@
      // 退回券

      sendBackTimeOutCoupon(uid);

      // 活动领取券

      receivedCoupon(uid);

//      receivedCoupon(uid);



      // 订单相关的券

      List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();

@@ -549,7 +549,7 @@
      sendBackTimeOutCoupon(uid);

      

      // 活动领取券

      receivedCoupon(uid);

//      receivedCoupon(uid);



      // 商品相关的券

      List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();