From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java |  237 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 125 insertions(+), 112 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
index e0dc7d3..b625e0f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/CommonContentController.java
@@ -1,112 +1,125 @@
-package com.yeshi.fanli.controller.client.v1;
-
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.JsonUtil;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.dto.common.CommonContentNav;
-import com.yeshi.fanli.dto.common.CommonContentResult;
-import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
-import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
-import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-/**
- * 閫氱敤妯℃澘
- * 
- * @author Administrator
- *
- */
-@Controller
-@RequestMapping("api/v1/commoncontent")
-public class CommonContentController {
-
-	@Resource
-	private SwiperPictureService swiperPictureService;
-
-	@Resource
-	private HongBaoManageService hongBaoManageService;
-
-	@Resource
-	private CommonTemplateContentService commonTemplateContentService;
-
-	/**
-	 * 閫氱敤妯℃澘瀵艰埅
-	 * 
-	 * @param acceptData
-	 * @param key
-	 * @param out
-	 */
-	@RequestMapping(value = "getNavList", method = RequestMethod.POST)
-	public void getNavList(AcceptData acceptData, String key, PrintWriter out) {
-		if (StringUtil.isNullOrEmpty(key)) {
-			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
-			return;
-		}
-		List<CommonContentNav> list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));
-		out.print(JsonUtil.loadTrueResult(new Gson().toJson(list)));
-	}
-
-	/**
-	 * 鑾峰彇鍐呭
-	 * 
-	 * @param acceptData
-	 * @param key
-	 * @param page-椤电爜
-	 * @param navId-瀵艰埅ID
-	 * @param out
-	 */
-	@RequestMapping(value = "getNavGoodsList", method = RequestMethod.POST)
-	public void getNavContent(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
-		if (StringUtil.isNullOrEmpty(key)) {
-			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
-			return;
-		}
-
-		if (page == null || page < 1) {
-			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ユ纭殑page"));
-			return;
-		}
-
-		CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
-				cid, page, 10);
-
-		// 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
-		List<SwiperPicture> bannerList = new ArrayList<>();
-
-		JSONObject root = new JSONObject();
-		if (page == 1)
-			root.put("bannerList", new Gson().toJson(bannerList));
-
-		JSONArray array = new JSONArray();
-		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
-		BigDecimal pro = hongBaoManageService.getFanLiRate();
-		List<TaoBaoGoodsBrief> goodsList = result.getGoodsList();
-		for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
-			array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "")));
-		}
-		root.put("goodsList", array);
-		root.put("goodsCount", result.getCount());
-		out.print(JsonUtil.loadTrueResult(root));
-	}
-
-}
+package com.yeshi.fanli.controller.client.v1;
+
+import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import com.yeshi.fanli.entity.goods.CommonGoods;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.common.CommonContentNav;
+import com.yeshi.fanli.dto.common.CommonContentResult;
+import com.yeshi.fanli.dto.common.CommonContentTypeEnum;
+import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.service.inter.goods.CommonTemplateContentService;
+import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
+import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+/**
+ * 閫氱敤妯℃澘
+ * 
+ * @author Administrator
+ *
+ */
+@Controller
+@RequestMapping("api/v1/commoncontent")
+public class CommonContentController {
+
+	@Resource
+	private SwiperPictureService swiperPictureService;
+
+	@Resource
+	private HongBaoManageService hongBaoManageService;
+
+	@Resource
+	private CommonTemplateContentService commonTemplateContentService;
+
+	@Resource
+	private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
+
+	/**
+	 * 閫氱敤妯℃澘瀵艰埅
+	 * 
+	 * @param acceptData
+	 * @param key
+	 * @param out
+	 */
+	@RequestMapping(value = "getNavList", method = RequestMethod.POST)
+	public void getNavList(AcceptData acceptData, String key, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(key)) {
+			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
+			return;
+		}
+		List<CommonContentNav> list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key),acceptData.getSystem());
+		out.print(JsonUtil.loadTrueResult(new Gson().toJson(list)));
+	}
+
+	/**
+	 * 鑾峰彇鍐呭
+	 * 
+	 * @param acceptData
+	 * @param key
+	 * @param page-椤电爜
+	 * @param navId-瀵艰埅ID
+	 * @param out
+	 */
+	@RequestMapping(value = "getNavGoodsList", method = RequestMethod.POST)
+	public void getNavContent(AcceptData acceptData, String key, Integer page, String cid, PrintWriter out) {
+		if (StringUtil.isNullOrEmpty(key)) {
+			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ey"));
+			return;
+		}
+
+		if (page == null || page < 1) {
+			out.print(JsonUtil.loadFalseResult(1, "璇蜂紶鍏ユ纭殑page"));
+			return;
+		}
+
+		CommonContentResult result = commonTemplateContentService.getContentList(CommonContentTypeEnum.valueOf(key),
+				cid, page, 10,acceptData.getSystem());
+
+		// 淇濈暀鏆傛椂涓嶅紑鍚紝寰呭悗缁紑鍚�
+		List<SwiperPicture> bannerList = new ArrayList<>();
+
+		JSONObject root = new JSONObject();
+		if (page == 1)
+			root.put("bannerList", new Gson().toJson(bannerList));
+
+		JSONArray array = new JSONArray();
+		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();
+		BigDecimal pro = hongBaoManageService.getFanLiRate(acceptData.getSystem());
+		if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
+			pro = new BigDecimal(100);
+		List<CommonGoods> goodsList = result.getGoodsList();
+		for (CommonGoods taoBaoGoodsBrief : goodsList) {
+//			TaoBaoGoodsBriefExtra extra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(taoBaoGoodsBrief, pro.toString(), "");
+//			if (CommonContentTypeEnum.valueOf(key) == CommonContentTypeEnum.mianDan)// 鍏嶅崟鍟嗗搧
+//			{
+//				extra.getTaoBaoHongBaoInfo().setRate("楼" + TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief));
+//				extra.getTaoBaoHongBaoInfo().setHongbao(TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief));
+//			}
+			array.add(gson.toJson(taoBaoGoodsBrief));
+		}
+		root.put("goodsList", array);
+		root.put("goodsCount", result.getCount());
+		out.print(JsonUtil.loadTrueResult(root));
+	}
+
+}

--
Gitblit v1.8.0