From b2cff7a3e9d5cebacef4866c5993e0be89ff5b00 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 27 九月 2019 14:36:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 529e22d..bb46625 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -45,8 +45,10 @@
import com.yeshi.fanli.entity.dynamic.GoodsPicture;
import com.yeshi.fanli.entity.dynamic.InviteMaterial;
import com.yeshi.fanli.entity.jd.JDGoods;
+import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
+import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.exception.ActivityException;
import com.yeshi.fanli.exception.push.PushException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
@@ -68,6 +70,8 @@
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.TaoBaoUtil;
+import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.vo.goods.GoodsDetailVO;
import net.sf.json.JSONArray;
@@ -579,8 +583,28 @@
}
out.print("success");
+ }
+
+ @RequestMapping(value = "testListTLJGoods")
+ public void getGoodsList(String callback,PrintWriter out) {
+ SearchFilter sf = new SearchFilter();
+ sf.setMaterialId("19450");
+ sf.setQuan(1);
+ sf.setTmall(true);
+ sf.setStartTkRate(5);
+ sf.setEndPrice(new BigDecimal(1000));
+ sf.setPage(1);
+ sf.setPage(100);
+
+ TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
+ Gson gson = new Gson();
+ JSONArray array=new JSONArray();
+ for (TaoBaoGoodsBrief goods : result.getTaoBaoGoodsBriefs()) {
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, "100", null)));
+ }
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
}
-
+
/**
* 鎻掑叆閭�璇风礌鏉�
@@ -598,4 +622,5 @@
e.printStackTrace();
}
}
+
}
--
Gitblit v1.8.0