From c8a99ed8218fe034e9c33236969fcbec9eac75bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 24 七月 2019 14:23:25 +0800
Subject: [PATCH] 调整淘宝订单与维权订单爬取

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java |   39 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
index 0fcae94..5cacf02 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
@@ -23,6 +23,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.entity.taobao.TaoBaoHongBaoInfo;
 import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
@@ -40,6 +41,7 @@
 import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;
 import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
@@ -97,6 +99,9 @@
 
 	@Resource
 	private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
+
+	@Resource
+	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
 
 	/**
 	 * 9.9鍟嗗搧
@@ -869,6 +874,40 @@
 		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
 	}
 
+	@RequestMapping("getFlashSaleNew")
+	public void getFlashSaleNew(String callback, Integer page, Long auctionId, String time, PrintWriter out) {
+		List<DaTaoKeDetail> detailList0 = daTaoKeGoodsDetailService.getDingDongQiangData(time);
+		if (detailList0 == null)
+			detailList0 = new ArrayList<>();
+		List<DaTaoKeDetail> detailList = new ArrayList<>();
+		detailList.addAll(detailList0);
+		JSONArray array = new JSONArray();
+		if (page == 1) {
+			if (auctionId != null && detailList != null)
+				for (int i = 0; i < detailList.size(); i++) {
+					if (detailList.get(i).getGoodsId().longValue() == auctionId) {
+						DaTaoKeDetail goods = detailList.get(i);
+						detailList.remove(i);
+						detailList.add(0, goods);
+						break;
+					}
+				}
+
+			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+			if (detailList != null)
+				for (DaTaoKeDetail detail : detailList) {
+					array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail),
+							hongBaoManageService.getFanLiRate() + "", null)));
+				}
+		}
+
+		JSONObject data = new JSONObject();
+		data.put("count", detailList.size());
+		data.put("result_list", array);
+		JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+	}
+
 	/**
 	 * 澶ч鍒革紙鍒搁潰鍊艰寖鍥达級
 	 * 

--
Gitblit v1.8.0