From 01e773cf27e572b8fb83538d85f31130930d93d1 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 15 八月 2019 15:57:23 +0800
Subject: [PATCH] 券赠送
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 01d3688..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
@@ -157,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("鎴愬姛"));
}
@@ -213,7 +214,8 @@
// 缁熻鍟嗗搧鏁伴噺
long totalgoods = 0;
// 鍟嗗搧id
- Long auctionId = null;
+ CommonGoods commonGoods = null;
+
if (StringUtil.isNullOrEmpty(picture)) {
try {
List<PushGoodsGroup> listGroup = pushGoodsGroupService.getAllInfoByPushId(pushId);
@@ -224,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();
}
}
}
@@ -264,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");
@@ -279,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