From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
index ec6a0c9..d6d65ea 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -24,6 +24,7 @@
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsRecordMapper;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
@@ -31,6 +32,7 @@
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CommonGoodsException;
@@ -227,9 +229,9 @@
}
@Override
- public void saveSingleShareRecord(Long uid, Long auctionId, Integer goodsType)
+ public void saveSingleShareRecord(Long uid, Long goodsId, Integer goodsType)
throws UserShareGoodsRecordException {
- if (auctionId == null) {
+ if (goodsId == null) {
throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖");
}
@@ -243,13 +245,21 @@
CommonGoods convertGoods = null;
if (goodsType == Constant.SOURCE_TYPE_JD) {
-
+ JDGoods jdGoods = redisManager.getJDGoods(goodsId);
+ if (jdGoods == null) {
+ throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+ }
+ convertGoods = CommonGoodsFactory.create(jdGoods);
} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
-
+ PDDGoodsDetail pddGoods = redisManager.getPDDGoodsDetail(goodsId);
+ if (pddGoods == null) {
+ throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+ }
+ convertGoods = CommonGoodsFactory.create(pddGoods);
} else {
TaoBaoGoodsBrief goodsBrief = null;
try {
- goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
+ goodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);
} catch (TaobaoGoodsDownException e) {
throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
}
--
Gitblit v1.8.0