admin
2019-02-27 7d294e1e04095eb4f1c0807406d1ccb8461850cb
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -570,7 +570,7 @@
      // 消息推送
      try {
         if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);
//            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
         } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
            userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
         }
@@ -1143,10 +1143,6 @@
   public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
         Long auctionId) throws  Exception{
      
      //只处理付款金额小于10的
      if(payment==null||payment.compareTo(new BigDecimal(10))<0)
         return false;
      boolean isfree = false;
      
      if (uid == null || payment == null || auctionId == null || orderNo == null || 
@@ -1209,7 +1205,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);
            }