From e068c9acf06cff7673fadfca686128f6d6d66e20 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 12 八月 2019 11:12:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
index dcb4547..e3309c3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java
@@ -214,7 +214,8 @@
// 缁熻鍟嗗搧鏁伴噺
long totalgoods = 0;
// 鍟嗗搧id
- Long auctionId = null;
+ CommonGoods commonGoods = null;
+
if (StringUtil.isNullOrEmpty(picture)) {
try {
List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushId);
@@ -225,10 +226,9 @@
PushGoodsGroup pushGoodsGroup = listGroup.get(0);
if (pushGoodsGroup != null) {
- CommonGoods commonGoods = pushGoodsGroup.getCommonGoods();
+ commonGoods = pushGoodsGroup.getCommonGoods();
if (commonGoods != null) {
picture = commonGoods.getPicture();
- auctionId = commonGoods.getGoodsId();
}
}
}
@@ -265,8 +265,8 @@
JumpDetailV2 jumpDetail = null;
if (totalgoods == 1) {
-
- params = JumpDetailParamsFactory.createGoodsParams(auctionId);
+ params = JumpDetailParamsFactory.createGoodsParams(commonGoods.getGoodsId(),
+ commonGoods.getGoodsType());
// 鍗曚釜鍟嗗搧璺宠浆鍟嗗搧璇︽儏
jumpDetail = jumpDetailV2Service.getByTypeCache("goodsdetail",
Constant.getPlatformCode(acceptData.getPlatform()),
--
Gitblit v1.8.0