Merge remote-tracking branch 'origin/master'

admin

2019-02-27 9aa335f99a99c7e4b0e01b329bbd5d2c929fb3b8

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

@@ -601,7 +601,7 @@
      // 消息推送

      try {

         if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);

//            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);

         } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {

            userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);

         }

@@ -1236,7 +1236,7 @@
               // 券已使用

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);

            } else    if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

               userOtherMsgNotificationService.welfareCouponUsed(userSystemCoupon);

               userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);

            } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);

            }