From d3a9feeeee6f70462d12e48db5fd1cab9b183bc8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 17:14:54 +0800
Subject: [PATCH] 更改goodsType

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index c018eb5..dfdee68 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -88,12 +88,13 @@
 import com.yeshi.fanli.service.inter.homemodule.SpecialService;
 import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;
 import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
+import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
 import com.yeshi.fanli.service.inter.monitor.MonitorService;
 import com.yeshi.fanli.service.inter.order.OrderService;
 import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
@@ -109,7 +110,6 @@
 import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
 import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserMoneyExtraService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 import com.yeshi.fanli.util.RedisManager;
@@ -2555,11 +2555,11 @@
 	 * @param out
 	 */
 	@RequestMapping(value = "getSpecialActivities")
-	public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
+	public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out, String callback) {
 		int platformCode = Constant.getPlatformCode(acceptData.getPlatform());
 		List<Special> listSpecial = specialService.listByVersion(0, Integer.MAX_VALUE, "special_activities",
 				platformCode, Integer.parseInt(acceptData.getVersion()));
-	
+
 		List<Special> list = new ArrayList<Special>();
 		if (listSpecial != null) {
 			list.addAll(listSpecial);
@@ -2594,6 +2594,9 @@
 
 		JSONObject root = new JSONObject();
 		root.put("special", JsonUtil.getApiCommonGson().toJson(list));
-		out.print(JsonUtil.loadTrueResult(root));
+		if (StringUtil.isNullOrEmpty(callback))
+			out.print(JsonUtil.loadTrueResult(root));
+		else
+			JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(root));
 	}
 }

--
Gitblit v1.8.0