yujian
2019-08-29 d73ab2021def996f6c89f3a51c8fa1b5d65fe3b3
fanli/src/main/java/com/yeshi/fanli/service/impl/user/TokenRecordServiceImpl.java
@@ -331,11 +331,10 @@
         if (userCoupon == null || userCoupon.getGive() == null || !userCoupon.getGive()
               || userCoupon.getState() != UserSystemCoupon.STATE_IN_USE)
            throw new TokenRecordException(1, "该券不存在或非赠送");
         
         UserSystemCoupon userSystemCoupon= null;
         try {
            userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(),
            userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.freeCoupon.name(),
                  UserSystemCoupon.SOURCE_GIVE, null);
         } catch (Exception e) {
            LogHelper.errorDetailInfo(e);
@@ -362,9 +361,13 @@
         // 更新赠送记录
         UserSystemCouponGiveRecord updateGiveRecord = new UserSystemCouponGiveRecord();
         updateGiveRecord.setId(giveRecord.getId());
         updateGiveRecord.setReceiveUid(uid);
         updateGiveRecord.setReceiveTime(new Date());
         updateGiveRecord.setState(UserSystemCouponGiveRecord.STATE_RECEIVE);
         if (userSystemCoupon != null) {
            updateGiveRecord.setReceiveId(userSystemCoupon.getId());
         }
         userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateGiveRecord);
         integralGetService.addGiveFreeCoupon(giveUid);
@@ -419,8 +422,9 @@
         if (systemCoupon == null)
            throw new TokenRecordException(1, "该券不存在");
         
         UserSystemCoupon userSystemCoupon= null;
         try {
            userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
            userSystemCoupon = userSystemCouponService.insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(),
                  UserSystemCoupon.SOURCE_GIVE, systemCoupon.getPercent());
         } catch (Exception e) {
            LogHelper.errorDetailInfo(e);
@@ -447,9 +451,13 @@
         // 更新赠送记录
         UserSystemCouponGiveRecord updateGiveRecord = new UserSystemCouponGiveRecord();
         updateGiveRecord.setId(giveRecord.getId());
         updateGiveRecord.setReceiveUid(uid);
         updateGiveRecord.setReceiveTime(new Date());
         updateGiveRecord.setState(UserSystemCouponGiveRecord.STATE_RECEIVE);
         if (userSystemCoupon != null) {
            updateGiveRecord.setReceiveId(userSystemCoupon.getId());
         }
         userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateGiveRecord);
         integralGetService.addGiveRebateCoupon(giveUid);