Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java

@@ -14,8 +14,8 @@
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;

import com.yeshi.fanli.entity.push.PushCoupon;

import com.yeshi.fanli.entity.push.PushCouponRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.push.PushCouponException;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.push.PushCouponRecordService;

import com.yeshi.fanli.service.inter.push.PushCouponService;

@@ -85,7 +85,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void save(PushCoupon record) throws PushCouponException,Exception {

      if (record == null) {

         throw new PushCouponException(1, "参数不正确");

@@ -125,9 +125,9 @@
               pushCouponRecord.setCreateTime(new Date());

            

               // 插入领取记录

               pushCouponRecordService.insertSelective(pushCouponRecord);

               //pushCouponRecordService.insertSelective(pushCouponRecord);

               // 直接发送券

               userSystemCouponService.randomRewardCoupon(amount, uid, UserSystemCoupon.SOURCE_SYSTEM_PUSH);

               //userSystemCouponService.randomRewardCoupon(amount, uid, UserSystemCoupon.SOURCE_SYSTEM_PUSH);

            }

         }

         

@@ -153,7 +153,7 @@
   }



   @Override

   @Transactional

   @Transactional(rollbackFor=Exception.class)

   public void executePush(Long id) throws Exception, PushCouponException, PushException {



      PushCoupon pushCoupon = selectByPrimaryKey(id);