From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java
index 8ec2e23..d4b2da9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java
@@ -11,10 +11,11 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.push.PushCouponMapper;
+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;
@@ -84,7 +85,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void save(PushCoupon record) throws PushCouponException,Exception {
if (record == null) {
throw new PushCouponException(1, "鍙傛暟涓嶆纭�");
@@ -124,9 +125,9 @@
pushCouponRecord.setCreateTime(new Date());
// 鎻掑叆棰嗗彇璁板綍
- pushCouponRecordService.insertSelective(pushCouponRecord);
+ //pushCouponRecordService.insertSelective(pushCouponRecord);
// 鐩存帴鍙戦�佸埜
- userSystemCouponService.randomRewardCouponForPush(amount, uid);
+ //userSystemCouponService.randomRewardCoupon(amount, uid, UserSystemCoupon.SOURCE_SYSTEM_PUSH);
}
}
@@ -152,7 +153,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void executePush(Long id) throws Exception, PushCouponException, PushException {
PushCoupon pushCoupon = selectByPrimaryKey(id);
--
Gitblit v1.8.0