From 7664dae2f53abe3076a95c986ba64b2a8d949827 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:06:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/TestController.java | 159 ----------------------------------------------------
1 files changed, 2 insertions(+), 157 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 10f86e9..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,76 +292,6 @@
}
}
- @RequestMapping(value = "insertShop")
- public void insertShop(PrintWriter out) {
- try {
- dynamicInfoService.insertShopInfo();
- dynamicInfoService.insertTimeHotSale();
- dynamicInfoService.insertTimeRecommend();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * 鎻掑叆閭�璇风礌鏉�
- *
- * @param out
- */
- @RequestMapping(value = "uploadInviteMaterial")
- public void uploadInviteMaterial(PrintWriter out) {
- try {
- List<InviteMaterial> list = new ArrayList<InviteMaterial>();
-
- // 鍥剧墖鏂囦欢
- File file = new File("E:\\Invite\\Picture");
- File[] files = file.listFiles();
- for (File filePic : files) {// 閬嶅巻杩欎釜鏁扮粍
- String name = filePic.getName();
- String prefix = name.substring(name.lastIndexOf(".") + 1);
- // 涓婁紶鏂囦欢鐩稿浣嶇疆
- String filePath = "/resource/invite/everyday/" + UUID.randomUUID().toString().replace("-", "") + "."
- + prefix;
-
- String fileUrl = COSManager.getInstance().uploadFile(filePic, filePath).getUrl();
-
- System.out.println("FileName:" + name);
- System.out.println("url:" + fileUrl);
-
- InviteMaterial inviteMaterial = new InviteMaterial();
- inviteMaterial.setState(0);
- inviteMaterial.setPicture(fileUrl);
- list.add(inviteMaterial);
- }
-
- 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();
- }
- }
-
/**
* 鎻掑叆閭�璇风礌鏉�
*
@@ -476,7 +399,8 @@
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());
+ ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getVIPFanLiRate());
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
@@ -492,48 +416,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 鎻掑叆閭�璇风礌鏉�
- *
- * @param out
- */
- @RequestMapping(value = "queryExistsId")
- public void queryExistsAuctionId(PrintWriter out) {
- try {
- List<DynamicInfo> list = dynamicInfoDao.queryExistsAuctionId();
- for (DynamicInfo dynamicInfo : list) {
- List<GoodsPicture> imgs = dynamicInfo.getImgs();
- if (imgs == null || imgs.size() == 0) {
- continue;
- }
-
- boolean update = false;
- for (GoodsPicture goodsPicture : imgs) {
- TaoBaoGoodsBriefExtra goods = goodsPicture.getGoods();
- if (goods == null) {
- continue;
- }
-
- if (goods.getAuctionId() == null) {
- update = true;
- goods.setAuctionId(goods.getId());
- }
- }
-
- if (update) {
- dynamicInfo.setImgs(imgs);
- dynamicInfoDao.updateGoodInfo(dynamicInfo);
- }
- }
- JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- // JsonUtil.printMode(out, null,
- // JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(list)));
- } catch (Exception e) {
- JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
@@ -590,43 +472,6 @@
}
out.print("success");
- }
-
- @RequestMapping(value = "testListTLJGoods")
- public void getGoodsList(String callback, PrintWriter out) {
- SearchFilter sf = new SearchFilter();
- sf.setQuan(1);
- sf.setTmall(true);
- // sf.setEndPrice(new BigDecimal(1000));
- sf.setPage(1);
- sf.setPage(100);
- sf.setCateIds("16");
- sf.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
-
- 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)));
- }
-
- /**
- * 鎻掑叆閭�璇风礌鏉�
- *
- * @param out
- */
- @RequestMapping(value = "addInviteOrderLevelOne")
- public void addInviteOrderLevelOne(PrintWriter out) {
- try {
- System.out.println("-------------璇锋眰---------------");
- integralGetService.addShareSingleGoods(974767L);
- JsonUtil.printMode(out, null, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- } catch (Exception e) {
- JsonUtil.printMode(out, null, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
}
@RequestMapping("getLocalTime")
--
Gitblit v1.8.0