Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -8,6 +8,7 @@


import javax.annotation.Resource;



import org.springframework.context.annotation.Lazy;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;



@@ -80,6 +81,7 @@
   @Resource

   private UserOtherMsgNotificationService userOtherMsgNotificationService;

   

   @Lazy

   @Resource

   private IntegralGetService  integralGetService;

   

@@ -417,14 +419,9 @@
         if (systemCoupon == null)

            throw new TokenRecordException(1, "该券不存在");

         

         BigDecimal percent = null;

         String amount = systemCoupon.getAmount();

         if (!StringUtil.isNullOrEmpty(amount)) 
            percent = new BigDecimal(amount);

			
         try {

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

                  UserSystemCoupon.SOURCE_GIVE, percent);

                  UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent());

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

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