消息返回修改

admin

2019-02-28 4e938ce8cf18ebb12c102e7c18c1ca16fe1b15a8

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

@@ -220,7 +220,7 @@
         } else if (coupon.getType() != CouponTypeEnum.freeCoupon) {

            userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);

         } else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {

            userOtherMsgNotificationService.rewardCouponGet(userCoupon);

            userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());

         }

         

      } catch(Exception e) {

@@ -603,7 +603,7 @@
         if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

//            userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);

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

            userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);

//            userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);

         }

         

      } catch(Exception e) {

@@ -718,7 +718,7 @@
         

         // 消息推送

         try {

            userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);

            userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);

         } catch(Exception e) {

            LogHelper.errorDetailInfo(e);

         }

@@ -1234,11 +1234,11 @@
            SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());

            if (baseCoupon == null) {

               // 券已使用

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);

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

               userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);

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

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);

               userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);

            } 

         }

      }