From c84d8ecd97d111b01db9cfd807300d0491a95bc8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 08 一月 2019 16:38:34 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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..71849a7 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 {
--
Gitblit v1.8.0