From 6d821cbdf527a4b3ee2e93f8d625ecade86ba45b Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 12 十二月 2019 14:23:18 +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 | 135 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 120 insertions(+), 15 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 a69f674..6ee75c8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/TestController.java
@@ -42,14 +42,9 @@
import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.entity.bus.activity.ActivityShareResult;
import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
-import com.yeshi.fanli.entity.dynamic.DynamicInfo;
-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;
@@ -73,8 +68,6 @@
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;
@@ -299,18 +292,133 @@
}
}
- @RequestMapping(value = "insertShop")
- public void insertShop(PrintWriter out) {
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "uploadInviteMaterial2")
+ public void uploadInviteMaterial2(PrintWriter out) {
try {
- dynamicInfoService.insertShopInfo();
- dynamicInfoService.insertTimeHotSale();
- dynamicInfoService.insertTimeRecommend();
+ List<InviteMaterial> list = new ArrayList<InviteMaterial>();
+ File picfile = new File("E:\\Invite\\pic.txt");// Text鏂囦欢
+ BufferedReader brp = new BufferedReader(new FileReader(picfile));// 鏋勯�犱竴涓狟ufferedReader绫绘潵璇诲彇鏂囦欢
+ String fileUrl = "";
+ while ((fileUrl = brp.readLine()) != null) {// 浣跨敤readLine鏂规硶锛屼竴娆¤涓�琛�
+ if (StringUtil.isNullOrEmpty(fileUrl)) {
+ continue;
+ }
+ InviteMaterial inviteMaterial = new InviteMaterial();
+ inviteMaterial.setId(UUID.randomUUID().toString().replace("-", ""));
+ inviteMaterial.setState(0);
+ inviteMaterial.setPicture(fileUrl);
+ list.add(inviteMaterial);
+ }
+ brp.close();
+
+ List<String> listTxt = new ArrayList<String>();
+ File textfile = new File("E:\\Invite\\content.txt");// Text鏂囦欢
+ BufferedReader br = new BufferedReader(new FileReader(textfile));// 鏋勯�犱竴涓狟ufferedReader绫绘潵璇诲彇鏂囦欢
+ String s = "";
+ while ((s = br.readLine()) != null) {// 浣跨敤readLine鏂规硶锛屼竴娆¤涓�琛�
+ if (StringUtil.isNullOrEmpty(s)) {
+ continue;
+ }
+ listTxt.add(s);
+ }
+ br.close();
+
+ if (list.size() == 0 || listTxt.size() == 0 || listTxt.size() < list.size()) {
+ return;
+ }
+
+ for (int i = 0; i < list.size(); i++) {
+ InviteMaterial invite = list.get(i);
+ invite.setText(listTxt.get(i));
+ inviteMaterialService.insert(invite);
+ }
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
} catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("涓婁紶澶辫触"));
e.printStackTrace();
}
}
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "saveInvite")
+ public void saveInvite(InviteMaterial inviteMaterial, PrintWriter out) {
+ try {
+ inviteMaterial.setState(0);
+ inviteMaterialService.insert(inviteMaterial);
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("涓婁紶澶辫触"));
+ e.printStackTrace();
+ }
+ }
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "insertTimeInvite")
+ public void insertTimeInvite(PrintWriter out) {
+ try {
+ dynamicInfoService.insertTimeInvite();
+ JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 鎻掑叆閭�璇风礌鏉�
+ *
+ * @param out
+ */
+ @RequestMapping(value = "getJingFenList")
+ public void getJingFenList(String callback, Integer page, Integer eliteId, PrintWriter out) {
+ try {
+ JDSearchResult result = JDApiUtil.getJingFenGoods(page, eliteId);
+ long count = 0;
+ JSONObject data = new JSONObject();
+ JSONArray array = new JSONArray();
+ if (result != null) {
+ PageEntity pageEntity = result.getPageEntity();
+ if (pageEntity != null) {
+ count = pageEntity.getTotalCount();
+ }
+
+ List<JDGoods> goodsList = result.getGoodsList();
+ if (goodsList != null && goodsList.size() > 0) {
+ BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
+ BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate());
+
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ for (JDGoods goods : goodsList) {
+ GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO);
+ array.add(gson.toJson(goodsDetailVO));
+ }
+ }
+ }
+
+ data.put("count", count);
+ data.put("list", array);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
@RequestMapping(value = "getWaitingThreadsCount")
public void getWaitingThreadsCount(PrintWriter out) {
@@ -365,9 +473,6 @@
out.print("success");
}
-
-
-
@RequestMapping("getLocalTime")
public void getLocalTime(PrintWriter out) {
--
Gitblit v1.8.0