From df7554c138d0366514968eba9a32670876510df7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 二月 2020 14:10:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
index 374edf2..d4a296d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -5,6 +5,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Iterator;
@@ -40,9 +41,11 @@
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
import com.yeshi.fanli.entity.dynamic.InviteMaterial;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
+import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.activity.ActivityService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -61,6 +64,7 @@
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.push.OPPOPushUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
@@ -115,8 +119,6 @@
@Resource
private UserMoneyExtraService userMoneyExtraService;
-
-
@RequestMapping(value = "kefu")
public void kefu(HttpServletRequest request, PrintWriter out) {
@@ -435,5 +437,21 @@
}
} catch (Exception e) {
}
- }
+ }
+
+ @RequestMapping("getTBGoodsCate")
+ public void getTaoBaoGoodsCat(Long id, PrintWriter out) {
+ TaoBaoGoodsBrief goods = null;
+ try {
+ goods = TaoKeApiUtil.getSimpleGoodsInfo(id);
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ }
+ if (goods == null)
+ out.println("鍟嗗搧宸蹭笅鏋�");
+ else
+ out.println("<html><head><meta charset=utf-8></head><body>"
+ + String.format("cat_name:%s <br> cat_leaf_name:%s", goods.getRootCategoryName(), goods.getLeafName())
+ + "</body></html>");
+ }
}
--
Gitblit v1.8.0