From 17bcef56f4627c9bedd78666bf600dbcbd7498c4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 10:07:46 +0800
Subject: [PATCH] 邀请码激活验证上级是否正常
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
index 1af87c0..804cb98 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.goods.CommonGoodsException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -217,7 +218,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void addCommonGoods(Long uid, Set<Long> ids) throws UserGoodsStorageException {
if (uid == null) {
@@ -391,7 +392,7 @@
data.put("revenue", listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼" + totalMoney);
data.put("shareId", shareRecord.getRedisKey());
data.put("shareImg", uploadResult);
- data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));
return data;
}
@@ -444,12 +445,12 @@
// 鎻愮ず璇笉鍚�
if (goodsType == Constant.SOURCE_TYPE_JD) {
// 浜笢
- data.put("notifyDesc", configService.get("goods_share_notify_jd"));
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareNotifyJD.getKey()));
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
// 鎷煎澶�
- data.put("notifyDesc", configService.get("goods_share_notify_pdd"));
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareNotifyPDD.getKey()));
} else {
- data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
+ data.put("notifyDesc", configService.get(ConfigKeyEnum.goodsShareMultipleNotify.getKey()));
}
return data;
}
--
Gitblit v1.8.0