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

admin

2020-05-12 1faf3ab0ba6c17eee48e68e8d0077ea61f45d75d

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

@@ -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);

            }

         }