券消息修改

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

         }

@@ -1097,7 +1097,7 @@
   @Override

   public void  sendBackTimeOutCoupon(Long uid) {

      // 超过120秒 未被匹配的券

      List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120);

      List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);

      if (list == null || list.size() == 0) {

         return;

      }

@@ -1142,10 +1142,6 @@
   @Override

   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;

      

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

            }