From fe16122ad77ccd69c7f3c6dfff123c0c3aa3d35f Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 10:05:12 +0800
Subject: [PATCH] 商品详情
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index be43293..db168956 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -70,7 +70,7 @@
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import com.yeshi.fanli.vo.goods.MoneyInfoVO;
import com.yeshi.fanli.vo.goods.OtherInfo;
-import com.yeshi.fanli.vo.goods.ShareInfoVO;
+import com.yeshi.fanli.vo.goods.ShareVO;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.tlj.ReduceHongBao;
import com.yeshi.fanli.vo.tlj.SpreadHongBao;
@@ -160,13 +160,13 @@
*/
@RequestMapping(value = "getDetail", method = RequestMethod.POST)
public void getDetail(AcceptData acceptData, Long id, Integer goodsType, Long uid, String from, PrintWriter out) {
- if (id == null || goodsType == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧id鍜屽晢鍝佸钩鍙颁笉鑳戒负绌�"));
+ if (id == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧id涓嶈兘涓虹┖"));
return;
}
-
+
// 娣樺疂鍟嗗搧
- if (Constant.SOURCE_TYPE_TAOBAO == goodsType) {
+ if (goodsType == null || Constant.SOURCE_TYPE_TAOBAO == goodsType) {
getTaoBaoGoodsDetial(acceptData, id, uid, from, out);
return;
}
@@ -347,10 +347,10 @@
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
- GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(tb, null, fanLiRate, shareRate);
+ GoodsDetailVO goodsDetail = GoodsDetailVOFactory.convertTaoBao(goods, null, fanLiRate, shareRate);
// 搴楅摵淇℃伅
- TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(goods.getAuctionId(), goods.getSellerId());
+ TaoBaoShop shop = taoBaoShopService.getTaoBaoShop(id, goods.getSellerId());
if (shop != null) {
String shopLink = shop.getShopLink();
if (StringUtil.isNullOrEmpty(shopLink)) {
@@ -537,10 +537,10 @@
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());
- ShareInfoVO shareInfoVO = new ShareInfoVO();
+ ShareVO shareInfoVO = new ShareVO();
shareInfoVO.setUrl(shareUrl);
shareInfoVO.setHelpLink(helpLink);
- extraVO.setShareInfo(shareInfoVO);
+ extraVO.setShare(shareInfoVO);
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
@@ -665,10 +665,10 @@
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + jdGoods.getSkuId(),
Constant.systemCommonConfig.getAppShareInfoUrl());
- ShareInfoVO shareInfoVO = new ShareInfoVO();
+ ShareVO shareInfoVO = new ShareVO();
shareInfoVO.setUrl(shareUrl);
shareInfoVO.setHelpLink(helpLink);
- extraVO.setShareInfo(shareInfoVO);
+ extraVO.setShare(shareInfoVO);
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
@@ -777,10 +777,10 @@
}
// 鍒嗕韩璺緞
String shareUrl = String.format("%s?id=" + id, Constant.systemCommonConfig.getAppShareInfoUrl());
- ShareInfoVO shareInfoVO = new ShareInfoVO();
+ ShareVO shareInfoVO = new ShareVO();
shareInfoVO.setUrl(shareUrl);
shareInfoVO.setHelpLink(helpLink);
- extraVO.setShareInfo(shareInfoVO);
+ extraVO.setShare(shareInfoVO);
JSONObject object = new JSONObject();
object.put("extra", JsonUtil.getApiCommonGson().toJson(extraVO));
--
Gitblit v1.8.0