From 6fdcc0c26dd33e87a024a69ed635d9aedb59cad6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 07 一月 2020 12:02:50 +0800
Subject: [PATCH] 订单搜索引擎增量更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java |   56 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
index d125aea..04fc2ec 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
@@ -7,12 +7,14 @@
 
 import javax.annotation.Resource;
 
+import org.hibernate.engine.spi.VersionValue;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.yeshi.utils.JsonUtil;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.sun.accessibility.internal.resources.accessibility;
 import com.yeshi.fanli.dto.ConfigParamsDTO;
 import com.yeshi.fanli.dto.jd.JDFilter;
 import com.yeshi.fanli.dto.jd.JDSearchResult;
@@ -27,6 +29,7 @@
 import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.VersionUtil;
 import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
 import com.yeshi.fanli.util.jd.JDApiUtil;
 import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
@@ -50,8 +53,10 @@
 	 * 鍒嗕韩鍟嗗搧璇︽儏
 	 * 
 	 * @param callback
-	 * @param shareId  鍒嗕韩id
-	 * @param source   鏉ユ簮
+	 * @param shareId
+	 *            鍒嗕韩id
+	 * @param source
+	 *            鏉ユ簮
 	 * @param out
 	 */
 	@RequestMapping(value = "getDetail")
@@ -78,8 +83,10 @@
 	 * 鍒嗕韩鍟嗗搧鍒楄〃
 	 * 
 	 * @param callback
-	 * @param shareId  鍒嗕韩id
-	 * @param source   鏉ユ簮
+	 * @param shareId
+	 *            鍒嗕韩id
+	 * @param source
+	 *            鏉ユ簮
 	 * @param out
 	 */
 	@RequestMapping(value = "getList")
@@ -97,18 +104,18 @@
 				List<Long> listIdTB = new ArrayList<Long>();
 				List<Long> listIdJD = new ArrayList<Long>();
 				List<Long> listIdPDD = new ArrayList<Long>();
-				
+
 				for (int i = 0; i < list.size(); i++) {
 					CommonGoods commonGoods = list.get(i).getCommonGoods();
 					if (commonGoods == null) {
 						continue;
 					}
-					
+
 					Integer goodsType = commonGoods.getGoodsType();
 					if (goodsType == null) {
 						continue;
 					}
-					
+
 					if (Constant.SOURCE_TYPE_TAOBAO == goodsType) {
 						listIdTB.add(commonGoods.getGoodsId());
 					} else if (Constant.SOURCE_TYPE_JD == goodsType) {
@@ -117,7 +124,7 @@
 						listIdPDD.add(commonGoods.getGoodsId());
 					}
 				}
-				
+
 				// 娣樺疂楠岃瘉鏄惁鍦ㄥ敭
 				List<TaoBaoGoodsBrief> listTB = null;
 				if (listIdTB.size() > 0) {
@@ -127,7 +134,7 @@
 						e.printStackTrace();
 					}
 				}
-				
+
 				// 浜笢楠岃瘉鏄惁鍦ㄥ敭
 				List<JDGoods> listJD = null;
 				if (listIdJD.size() > 0) {
@@ -136,7 +143,7 @@
 						filter.setListId(listIdJD);
 						filter.setPageIndex(1);
 						filter.setPageSize(100);
-						JDSearchResult  result = JDApiUtil.queryByKey(filter);
+						JDSearchResult result = JDApiUtil.queryByKey(filter);
 						if (result != null) {
 							listJD = result.getGoodsList();
 						}
@@ -144,8 +151,7 @@
 						e.printStackTrace();
 					}
 				}
-				
-				
+
 				// 鎷煎澶氶獙璇佹槸鍚﹀湪鍞�
 				List<PDDGoodsDetail> listPDD = null;
 				if (listIdPDD.size() > 0) {
@@ -155,7 +161,7 @@
 						sf.setPage(1);
 						sf.setPageSize(100);
 						sf.setGoodsIdList(listIdPDD.toArray(ids));
-						PDDGoodsResult  result = PinDuoDuoApiUtil.searchGoods(sf);
+						PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf);
 						if (result != null) {
 							listPDD = result.getGoodsList();
 						}
@@ -163,13 +169,15 @@
 						e.printStackTrace();
 					}
 				}
-				
-				
+
 				Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 						.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 				BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
 				BigDecimal shareRate = hongBaoManageService.getShareRate();
-				ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE);
+				ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+						hongBaoManageService.getVIPFanLiRate());
+				
+				
 				for (UserShareGoodsGroup goodsGroup : list) {
 					CommonGoods commonGoods = goodsGroup.getCommonGoods();
 					if (commonGoods == null) {
@@ -180,11 +188,11 @@
 						goodsType = Constant.SOURCE_TYPE_TAOBAO;
 					}
 					Long commonGid = commonGoods.getGoodsId();
-					
+
 					if (goodsType == Constant.SOURCE_TYPE_TAOBAO && listTB != null && listTB.size() > 0) {
 						int state = 1; // 榛樿鍋滃敭
 						for (TaoBaoGoodsBrief goodsDetail : listTB) {
-							Long goodsId =goodsDetail.getAuctionId();
+							Long goodsId = goodsDetail.getAuctionId();
 							if (goodsId == commonGid || goodsId.equals(commonGid)) {
 								state = 0; // 鍦ㄥ敭
 								break;
@@ -192,11 +200,11 @@
 						}
 						commonGoods.setState(state);
 					}
-					
+
 					if (goodsType == Constant.SOURCE_TYPE_JD && listJD != null && listJD.size() > 0) {
 						int state = 1; // 榛樿鍋滃敭
 						for (JDGoods goodsDetail : listJD) {
-							Long goodsId =goodsDetail.getSkuId();
+							Long goodsId = goodsDetail.getSkuId();
 							if (goodsId == commonGid || goodsId.equals(commonGid)) {
 								state = 0; // 鍦ㄥ敭
 								break;
@@ -204,12 +212,11 @@
 						}
 						commonGoods.setState(state);
 					}
-					
-					
+
 					if (goodsType == Constant.SOURCE_TYPE_PDD && listPDD != null && listPDD.size() > 0) {
 						int state = 1; // 榛樿鍋滃敭
 						for (PDDGoodsDetail goodsDetail : listPDD) {
-							Long goodsId =goodsDetail.getGoodsId();
+							Long goodsId = goodsDetail.getGoodsId();
 							if (goodsId == commonGid || goodsId.equals(commonGid)) {
 								state = 0; // 鍦ㄥ敭
 								break;
@@ -219,7 +226,8 @@
 					}
 					GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, configParamsDTO);
 					if (!detailVO.isHasCoupon()) {
-						detailVO.setState(1);; // 宸叉姠鍏�
+						detailVO.setState(1);
+						; // 宸叉姠鍏�
 					}
 					array.add(gson.toJson(detailVO));
 				}

--
Gitblit v1.8.0