From 8a1878856e4cdd735d03c1cb7cd1576ed5967d1c Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期一, 09 三月 2020 17:51:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
index f2f1def..a4f66d6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushGoodsServiceImpl.java
@@ -15,8 +15,9 @@
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.push.PushGoods;
import com.yeshi.fanli.entity.push.PushGoodsGroup;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.push.PushGoodsException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
@@ -78,7 +79,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void save(PushGoods record, List<Long> goodsIds) throws PushGoodsException, Exception {
// 瀹氭椂鏃堕棿
@@ -127,7 +128,7 @@
saveGoodsInfo(isAdd, pushId, goodsIds);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void saveGoodsInfo(boolean isAdd, Long pushId, List<Long> goodsIds) throws Exception {
if (goodsIds == null || goodsIds.size() == 0) {
@@ -201,7 +202,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public int deleteBatchByPrimaryKey(List<Long> list) throws Exception {
/*List<PushGoods> lisState = pushGoodsMapper.listByPushState(list);
@@ -342,7 +343,7 @@
} else {
/* 澶氫釜鍟嗗搧鎺ㄩ�� */
- String url = configService.get("push_goods_details");
+ String url = configService.get(ConfigKeyEnum.pushGoodsDetails.getKey());
if (StringUtil.isNullOrEmpty(url)) {
throw new PushGoodsException(1, "鎺ㄩ�侀〉闈㈤摼鎺ヤ笉瀛樺湪");
}
--
Gitblit v1.8.0