From cd6848f4680bfa462cd4668b8068cb2868faf17a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 八月 2019 15:19:42 +0800
Subject: [PATCH] 秒杀接口更改

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 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 5be7177..07fec29 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
@@ -24,6 +24,7 @@
 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.entity.taobao.dataoke.DaTaoKeDetailV2;
 import com.yeshi.fanli.exception.taobao.TaoKeApiException;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.log.LogHelper;
@@ -41,7 +42,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.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
@@ -101,7 +102,7 @@
 	private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
 
 	@Resource
-	private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+	private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
 
 	/**
 	 * 9.9鍟嗗搧
@@ -876,17 +877,17 @@
 
 	@RequestMapping("getFlashSaleNew")
 	public void getFlashSaleNew(String callback, Integer page, Long auctionId, String time, PrintWriter out) {
-		List<DaTaoKeDetail> detailList0 = daTaoKeGoodsDetailService.getDingDongQiangData(time);
+		List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(time);
 		if (detailList0 == null)
 			detailList0 = new ArrayList<>();
-		List<DaTaoKeDetail> detailList = new ArrayList<>();
+		List<DaTaoKeDetailV2> 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);
+						DaTaoKeDetailV2 goods = detailList.get(i);
 						detailList.remove(i);
 						detailList.add(0, goods);
 						break;
@@ -896,7 +897,7 @@
 			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 			if (detailList != null)
-				for (DaTaoKeDetail detail : detailList) {
+				for (DaTaoKeDetailV2 detail : detailList) {
 					array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail),
 							hongBaoManageService.getFanLiRate() + "", null)));
 				}

--
Gitblit v1.8.0