From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
index cdd6ca4..86f9bd8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
@@ -2,12 +2,14 @@
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,22 +17,16 @@
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.activity.ActivityUser;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.entity.bus.activity.RecommendActivityInviteInfo;
-import com.yeshi.fanli.entity.bus.homemodule.HomeNavbar;
-import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/activity")
@@ -67,6 +63,16 @@
recommendActivity.setInviteInfo(info);
}
+ if (recommendActivity !=null) {
+ ActivityUser activityUser = recommendActivity.getActivityUser();
+ if (activityUser != null) {
+ ActivityUser resultUser = activityService.selectActivityUserByPrimaryKey(activityUser.getId());
+ if (resultUser != null) {
+ recommendActivity.setActivityUser(resultUser);
+ }
+ }
+ }
+
if (StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadTrueResult(recommendActivity));
} else {
@@ -193,8 +199,9 @@
out.print(callback + "(" + JsonUtil.loadFalseResult(1, "鍒嗕韩鍥句笉鑳戒负绌�") + ")");
return;
}
-
- // title = Jsoup.parse(title).text();
+
+ //鍘绘帀 鍥剧墖璺緞鍓嶅悗绌烘牸
+ img = img.trim();
try {
activityService.addInviteImgRecommendActivity(uid, title, img, top, shareCount, px, py, size);
@@ -293,7 +300,7 @@
if (!StringUtil.isNullOrEmpty(imgs)) {
JSONArray array = JSONArray.fromObject(imgs);
for (int i = 0; i < array.size(); i++)
- imgList.add(array.optString(i));
+ imgList.add(array.optString(i).trim());
}
try {
@@ -346,7 +353,7 @@
if (!StringUtil.isNullOrEmpty(imgs)) {
JSONArray array = JSONArray.fromObject(imgs);
for (int i = 0; i < array.size(); i++)
- imgList.add(array.optString(i));
+ imgList.add(array.optString(i).trim());
}
try {
--
Gitblit v1.8.0