券退回

yujian

2019-08-29 e1dcef9d29c8de98c603cd4880f6b272c23f1cc0

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

@@ -332,10 +332,9 @@
               || 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);