淘礼金赠送红包功能恢复

yujian

2019-10-22 10abb8f04d3bacd4cead1758aae48726ccd29c66

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

@@ -67,9 +67,6 @@
   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   @Resource

@@ -77,9 +74,6 @@


   @Resource

   private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;



   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;



   @Resource

   private UserOtherMsgNotificationService userOtherMsgNotificationService;

@@ -93,6 +87,13 @@
   

   @Resource

   private UserInviteMsgNotificationService userInviteMsgNotificationService;

	
   @Resource

   private UserTaoLiJinGiveRecordService userTaoLiJinGiveRecordService;

	
   @Resource

   private UserTaoLiJinOriginService userTaoLiJinOriginService;



   



   @Override

@@ -221,7 +222,6 @@
         }

      } else if (tokenType == TokenTypeEnum.taoLiJin) {

         type = 12;

			
         UserTaoLiJinGiveRecord giveRecord = userTaoLiJinGiveRecordService.selectByPrimaryKey(Long.parseLong(identify));

         if (giveRecord == null)

            throw new TokenRecordException(1, "口令已失效");

@@ -343,7 +343,7 @@
         UserSystemCoupon userSystemCoupon= null;

         try {

            userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(),

                  UserSystemCoupon.SOURCE_GIVE, null);

                  UserSystemCoupon.SOURCE_GIVE, null,true);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

            throw new TokenRecordException(1, "领取失败");

@@ -437,7 +437,7 @@
         UserSystemCoupon userSystemCoupon= null;

         try {

            userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),

                  UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent());

                  UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent(),true);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

            throw new TokenRecordException(1, "领取失败");