From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 25 七月 2019 12:19:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 10 +++++----- 1 files changed, 5 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 f8cc44f..40ad5f1 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 @@ -160,15 +160,15 @@ jdGoods = JDApiUtil.getGoodsDetail(auctionId); } if (jdGoods == null) { - throw new UserGoodsStorageException(1, "auctionId鍟嗗搧宸蹭笅鏋�"); + throw new UserGoodsStorageException(1, auctionId + "鍟嗗搧宸蹭笅鏋�"); } commonGoods = CommonGoodsFactory.create(jdGoods); - } else if (goodsType == Constant.SOURCE_TYPE_JD) { + } else if (goodsType == Constant.SOURCE_TYPE_PDD) { // 鎷煎澶� PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(auctionId); if (pddGoods == null) { - throw new UserGoodsStorageException(1, "auctionId鍟嗗搧宸蹭笅鏋�"); + throw new UserGoodsStorageException(1, auctionId + "鍟嗗搧宸蹭笅鏋�"); } commonGoods = CommonGoodsFactory.create(pddGoods); } else { @@ -178,7 +178,7 @@ TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId); commonGoods = CommonGoodsFactory.create(goodsBrief); } catch (TaobaoGoodsDownException e) { - throw new UserGoodsStorageException(1, "auctionId鍟嗗搧宸蹭笅鏋�"); + throw new UserGoodsStorageException(1, auctionId + "鍟嗗搧宸蹭笅鏋�"); } } @@ -348,7 +348,7 @@ } return state; } - + @Override public JSONObject shareGoods(Long uid, List<Long> listStorageID) throws UserGoodsStorageException, UserShareGoodsRecordException { -- Gitblit v1.8.0