From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/PushController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 e6ef213..0523d32 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
@@ -114,7 +114,7 @@
@RequestMapping(value = "callback", method = RequestMethod.POST)
public void callback(AcceptData acceptData, String pushId, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
+ acceptData.getPackages(),acceptData.getSystem());
if (system == null) {
out.print(JsonUtil.loadFalseResult("涓嶅瓨鍦ㄨ绯荤粺"));
return;
@@ -229,10 +229,10 @@
// 璁惧娉ㄥ唽鏃堕棿
Date createTime = deviceActive.getCreateTime();
- count = pushGoodsService.countHistoryByPushTime(uid, createTime);
+ count = pushGoodsService.countHistoryByPushTime(uid, createTime,acceptData.getSystem());
int pageSize = Constant.PAGE_SIZE;
- List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime);
+ List<PushGoods> list = pushGoodsService.listHistoryByPushTime((page - 1) * pageSize, pageSize, uid, createTime,acceptData.getSystem());
if (list == null)
list = new ArrayList<>();
@@ -288,7 +288,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("goodsdetail",Constant.getPlatformCode(acceptData.getPlatform()),
Integer.parseInt(acceptData.getVersion()));
} else {
- String url = configService.get(ConfigKeyEnum.pushGoodsDetails.getKey());
+ String url = configService.getValue(ConfigKeyEnum.pushGoodsDetails.getKey(),acceptData.getSystem());
if (url == null) {
url = "";
}
@@ -321,7 +321,7 @@
}
}
- String url = configService.get(ConfigKeyEnum.pushActivityLink.getKey());
+ String url = configService.getValue(ConfigKeyEnum.pushActivityLink.getKey(),acceptData.getSystem());
if (url == null) {
url = "";
}
@@ -452,7 +452,7 @@
scanResult = scanNum +"";
}
- String jumpLink = configService.get(ConfigKeyEnum.activityDetailLink.getKey()) + "?type=%s&id=%s";
+ String jumpLink = configService.getValue(ConfigKeyEnum.activityDetailLink.getKey(),acceptData.getSystem()) + "?type=%s&id=%s";
jumpLink = String.format(jumpLink, "circle", goodsEvaluate.getId());
if (!StringUtil.isNullOrEmpty(goodsEvaluate.getJumpLink())) {
goodsEvaluate.setJumpLink(jumpLink);
--
Gitblit v1.8.0