From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 一月 2021 15:26:55 +0800
Subject: [PATCH] 拼多多授权绑定
---
fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
index 58c3a47..ea8e546 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/DynamicController.java
@@ -26,7 +26,8 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.JumpDetailUtil;
import com.yeshi.fanli.util.jd.JDApiUtil;
-import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
+import com.yeshi.fanli.vo.homemodule.SpecialVO;
+import com.yeshi.common.vo.ClientTextStyleVO;
import net.sf.json.JSONObject;
@@ -115,14 +116,14 @@
listKey.add("special_channel_jd");
listKey.add("special_channel_pdd");
- List<Special> list = specialService.listByPlaceKeyHasLabel((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE,
- listKey, platformCode, Integer.parseInt(acceptData.getVersion()));
+ List<SpecialVO> list = specialService.listByPlaceKeyHasLabel((page - 1) * Constant.PAGE_SIZE, Constant.PAGE_SIZE,
+ listKey, platformCode, Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
long time = System.currentTimeMillis();
// 鍒犻櫎灏氭湭鍚敤鐨勮繃鏈熺殑
for (int i = 0; i < list.size(); i++) {
- Special special = list.get(i);
+ SpecialVO special = list.get(i);
if (special.getJumpDetail() != null) {
special.setJumpDetail(JumpDetailUtil.getWXMPJumDetail(special.getJumpDetail()));
}
@@ -130,12 +131,7 @@
if (special.getState() == 1L) {
list.remove(i--);
} else {
- if (special.getStartTime() != null && special.getEndTime() != null)
- special.setTimeTask(true);
- else
- special.setTimeTask(false);
-
- if (special.isTimeTask()) {
+ if (special.getStartTime() != null && special.getEndTime() != null) {
if (time < special.getStartTime().getTime() || time > special.getEndTime().getTime()) {
list.remove(i--);
} else// 璁剧疆鍊掕鏃�
@@ -156,7 +152,7 @@
}
long count = specialService.countByPlaceKeyList(listKey, platformCode,
- Integer.parseInt(acceptData.getVersion()));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());
GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
Gson gson = gsonBuilder.create();
@@ -188,7 +184,7 @@
JSONObject paramsJson = JSONObject.fromObject(params);
// 浜笢杞摼
String url = paramsJson.optString("url");
- String link = JDApiUtil.convertLinkWithSubUnionId(url, null, JDApiUtil.POSITION_FANLI + "", uid + "");
+ String link = JDApiUtil.convertLinkWithSubUnionId(url, null, null,JDApiUtil.POSITION_FANLI + "", uid + "");
if (StringUtil.isNullOrEmpty(link)) {
out.print(JsonUtil.loadFalseResult("杞摼澶辫触"));
--
Gitblit v1.8.0