From 30cba46c3a27a307f5658f1078f927f6b7100e00 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 17 十二月 2019 10:22:04 +0800
Subject: [PATCH] 兼容京东领券链接

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
index ca8d88b..a17e140 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
@@ -79,6 +79,10 @@
 				return;
 			}
 			
+			if (!canClose && StringUtil.isNullOrEmpty(contentUrl)) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+				return;
+			}
 			
 			SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 			
@@ -145,6 +149,11 @@
 			
 			if (canClose && !StringUtil.isNullOrEmpty(appPageNotification.getContentUrl())) {
 				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴鍜屽厑璁稿叧闂笉鍙悓鏃跺瓨鍦�"));
+				return;
+			}
+			
+			if (!canClose && StringUtil.isNullOrEmpty(appPageNotification.getContentUrl())) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
 				return;
 			}
 			
@@ -285,6 +294,11 @@
 				return;
 			}
 			
+			if (!canClose && StringUtil.isNullOrEmpty(resultObj.getContentUrl())) {
+				JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+				return;
+			}
+			
 			AppPageNotification newOBj = new AppPageNotification();
 			newOBj.setId(resultObj.getId());
 			newOBj.setCanClose(canClose);

--
Gitblit v1.8.0