From 9900d2ccb0b75b445459dafc9e28812db4da6f6e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 12 八月 2019 10:32:04 +0800
Subject: [PATCH] 商品更新规则修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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 a443351..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
@@ -11,6 +11,7 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.taobao.TbImgUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.common.JumpDetailV2;
@@ -156,7 +157,8 @@
*/
@RequestMapping(value = "/bindHWPush", method = RequestMethod.POST)
public void bindHWDeviceToken(AcceptData acceptData, String token, Long uid, PrintWriter out) {
- deviceTokenHWService.addDeviceToken(token, acceptData.getDevice(), uid);
+ deviceTokenHWService.addDeviceToken(token, acceptData.getDevice(), uid,
+ Integer.parseInt(acceptData.getVersion()));
out.print(JsonUtil.loadTrueResult("鎴愬姛"));
}
@@ -212,7 +214,8 @@
// 缁熻鍟嗗搧鏁伴噺
long totalgoods = 0;
// 鍟嗗搧id
- Long auctionId = null;
+ CommonGoods commonGoods = null;
+
if (StringUtil.isNullOrEmpty(picture)) {
try {
List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushId);
@@ -223,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();
}
}
}
@@ -235,7 +237,7 @@
}
}
- result.put("picture", picture);
+ result.put("picture", TbImgUtil.getTBSize320Img(picture));
String fontColor1 = "#666666";
String fontColor2 = "#E5005C";
@@ -263,10 +265,12 @@
JumpDetailV2 jumpDetail = null;
if (totalgoods == 1) {
-
- params = JumpDetailParamsFactory.createGoodsParams(auctionId);
+ params = JumpDetailParamsFactory.createGoodsParams(commonGoods.getGoodsId(),
+ commonGoods.getGoodsType());
// 鍗曚釜鍟嗗搧璺宠浆鍟嗗搧璇︽儏
- jumpDetail = jumpDetailV2Service.getByTypeCache("goodsdetail");
+ jumpDetail = jumpDetailV2Service.getByTypeCache("goodsdetail",
+ Constant.getPlatformCode(acceptData.getPlatform()),
+ Integer.parseInt(acceptData.getVersion()));
} else {
String url = configService.get("push_goods_details");
@@ -278,7 +282,9 @@
params = JumpDetailParamsFactory.createWEBParams(url);
// 璺宠浆鎺ㄨ崘璇︽儏
- jumpDetail = jumpDetailV2Service.getByTypeCache("web");
+ jumpDetail = jumpDetailV2Service.getByTypeCache("web",
+ Constant.getPlatformCode(acceptData.getPlatform()),
+ Integer.parseInt(acceptData.getVersion()));
}
result.put("params", params);
result.put("jumpDetail", jumpDetail);
--
Gitblit v1.8.0