From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java |   72 +++++++++++++++---------------------
 1 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
index b31084e..405b1de 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
@@ -112,7 +112,7 @@
 			}
 
 			// 鎻掑叆鍟嗗搧闆嗗悎
-			List<Long> listAuctionId = new ArrayList<Long>();
+			List<String> listAuctionId = new ArrayList<>();
 			for (TaoBaoGoodsBrief goodsBrief : listTaoBaoGoods) {
 				listAuctionId.add(goodsBrief.getAuctionId());
 			}
@@ -171,7 +171,7 @@
 				}
 
 				/* 鍒稿悗浠�--璁$畻 */
-				BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+				BigDecimal couponPrice = TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief);
 				map.put("couponPrice", couponPrice);
 
 				/* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
@@ -187,13 +187,13 @@
 				int existence = 0;
 
 				/* 鏌ヨ鍟嗗搧鏄惁宸插瓨鍦ㄥ晢鍝佺簿閫夊簱涓� */
-				Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
+				String localAuctionId = taoBaoGoodsBrief.getAuctionId();
 				if (localAuctionId != null) {
 					if (listHas != null && listHas.size() > 0) {
 						for (QualityFactory selectionGoods : listHas) {
 							TaoBaoGoodsBrief hasgoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
-							Long hasId = hasgoodsBrief.getAuctionId();
-							if (localAuctionId.equals(hasId) || localAuctionId == hasId) {
+							String hasId = hasgoodsBrief.getAuctionId();
+							if (TaoBaoUtil.isEqual( localAuctionId,hasId)) {
 								existence = 1; // 瀛樺湪鍟嗗搧涓�
 							}
 						}
@@ -258,7 +258,7 @@
 			}
 
 			Gson gson2 = new Gson();
-			List<Long> listTaoBaoId = gson2.fromJson(auctionIds, new TypeToken<ArrayList<Long>>() {
+			List<String> listTaoBaoId = gson2.fromJson(auctionIds, new TypeToken<ArrayList<String>>() {
 			}.getType());
 			if (listTaoBaoId == null || listTaoBaoId.size() == 0) {
 				out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝g‘鐨勫晢鍝佸叆搴�")));
@@ -281,9 +281,9 @@
 				return;
 			}
 
-			List<TaoBaoGoodsBrief> listAddGoods = new ArrayList<TaoBaoGoodsBrief>();
+			List<TaoBaoGoodsBrief> listAddGoods = new ArrayList<>();
 			for (TaoBaoGoodsBrief taoBaoGoodsBrief : listTaoBaoGoods) {
-				Long auctionId = taoBaoGoodsBrief.getAuctionId();
+				String auctionId = taoBaoGoodsBrief.getAuctionId();
 				if (listTaoBaoId.contains(auctionId)) {
 					listAddGoods.add(taoBaoGoodsBrief);
 					listTaoBaoId.remove(auctionId);
@@ -291,7 +291,7 @@
 			}
 
 			if (listTaoBaoId != null && listTaoBaoId.size() > 0) {
-				for (Long auctionId : listTaoBaoId) {
+				for (String auctionId : listTaoBaoId) {
 					/* 鏍规嵁auctionId 鑾峰彇娣樺疂鍟嗗搧 */
 					TaoBaoGoodsBrief goodsBrief = TaoKeApiUtil.searchGoodsDetail(auctionId);
 					if (goodsBrief != null) {
@@ -439,14 +439,14 @@
 		}
 
 		boolean islink = false;
-		Long auctionId = null;
+		String auctionId = null;
 		/* 鍒ゆ柇鏄惁鏄晢鍝侀摼鎺ユ悳绱� */
 		if (key != null && key.contains("//") && key.contains("&")) {
 			String[] keyArray = key.split("\\?")[1].split("&");
 			if (keyArray != null && keyArray.length > 0) {
 				String id = keyArray[0].replace("id=", "").trim();
 				if (!StringUtil.isNullOrEmpty(id)) {
-					auctionId = Long.parseLong(id);
+					auctionId = id;
 					islink = true;
 				}
 			}
@@ -456,7 +456,7 @@
 
 		if (!islink) {
 			/* 娣樺疂鐗╂枡鎼滅储 */
-			result = TaoKeApiUtil.searchWuLiao(filter,null,null);
+			result = TaoKeApiUtil.searchWuLiaoNew(filter,null,null);
 		} else {
 			/* 鍟嗗搧閾炬帴鎼滅储 */
 			TaoBaoGoodsBrief searchGoodsDetail = TaoKeApiUtil.searchGoodsDetail(auctionId);
@@ -643,7 +643,7 @@
 					 */
 
 					/* 鍒稿悗浠�--璁$畻 */
-					BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+					BigDecimal couponPrice = TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief);
 					map.put("couponPrice", couponPrice);
 
 					/* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
@@ -658,7 +658,7 @@
 					int existence = 0;
 
 					/* 鏌ヨ鍟嗗搧鏄惁宸插瓨鍦ㄥ晢鍝佺簿閫夊簱涓� */
-					Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
+					String localAuctionId = taoBaoGoodsBrief.getAuctionId();
 
 					if (localAuctionId != null) {
 						List<TaoBaoGoodsBrief> taoBaoGoodsBriefList = taoBaoGoodsBriefService
@@ -669,7 +669,7 @@
 							TaoBaoGoodsBrief goodsBrief = taoBaoGoodsBriefList.get(0);
 
 							if (goodsBrief != null) {
-								Long id = goodsBrief.getId();
+								String id = goodsBrief.getAuctionId();
 								// 鏌ヨ绮鹃�夊簱
 								Long has = qualityFactoryService.queryCountByGoodsId(id);
 
@@ -755,18 +755,6 @@
 	 * 
 	 * @param callback
 	 * @param pageIndex
-	 * @param key
-	 *            鍏抽敭璇�
-	 * @param startPrice
-	 *            浠锋牸灏忓��
-	 * @param endPrice
-	 *            浠锋牸澶у��
-	 * @param startTkRate
-	 *            浣i噾灏忓��
-	 * @param endTkRate
-	 *            浣i噾澶у��
-	 * @param sort
-	 *            鎺掑簭
 	 * @param out
 	 */
 	@RequestMapping(value = "searchMaterial")
@@ -819,7 +807,7 @@
 			}
 
 			// 鎻掑叆鍟嗗搧闆嗗悎
-			List<Long> listAuctionId = new ArrayList<Long>();
+			List<String> listAuctionId = new ArrayList<>();
 			for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {
 				listAuctionId.add(goodsBrief.getAuctionId());
 			}
@@ -850,7 +838,7 @@
 				map.put("goodsSource", 1);
 
 				/* 鍒稿悗浠�--璁$畻 */
-				BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+				BigDecimal couponPrice = TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief);
 				map.put("couponPrice", couponPrice);
 
 				/* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
@@ -866,13 +854,13 @@
 				int existence = 0;
 
 				/* 鏌ヨ鍟嗗搧鏄惁宸插瓨鍦ㄥ晢鍝佺簿閫夊簱涓� */
-				Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
+				String localAuctionId = taoBaoGoodsBrief.getAuctionId();
 				if (localAuctionId != null) {
 					if (listHas != null && listHas.size() > 0) {
 						for (QualityFactory selectionGoods : listHas) {
 							TaoBaoGoodsBrief hasgoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
-							Long hasId = hasgoodsBrief.getAuctionId();
-							if (localAuctionId.equals(hasId) || localAuctionId == hasId) {
+							String hasId = hasgoodsBrief.getAuctionId();
+							if (TaoBaoUtil.isEqual(  localAuctionId,hasId)) {
 								existence = 1; // 瀛樺湪鍟嗗搧涓�
 							}
 						}
@@ -907,7 +895,7 @@
 	private List<Map<String, Object>> filterTaoBaoGoodsWithQulity(List<TaoBaoGoodsBrief> goodsList) {
 
 		// 鎻掑叆鍟嗗搧闆嗗悎
-		List<Long> listAuctionId = new ArrayList<Long>();
+		List<String> listAuctionId = new ArrayList<>();
 		for (TaoBaoGoodsBrief goodsBrief : goodsList) {
 			listAuctionId.add(goodsBrief.getAuctionId());
 		}
@@ -938,7 +926,7 @@
 			map.put("goodsSource", 1);
 
 			/* 鍒稿悗浠�--璁$畻 */
-			BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+			BigDecimal couponPrice = TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief);
 			map.put("couponPrice", couponPrice);
 
 			/* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
@@ -954,13 +942,13 @@
 			int existence = 0;
 
 			/* 鏌ヨ鍟嗗搧鏄惁宸插瓨鍦ㄥ晢鍝佺簿閫夊簱涓� */
-			Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
+			String localAuctionId = taoBaoGoodsBrief.getAuctionId();
 			if (localAuctionId != null) {
 				if (listHas != null && listHas.size() > 0) {
 					for (QualityFactory selectionGoods : listHas) {
 						TaoBaoGoodsBrief hasgoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
-						Long hasId = hasgoodsBrief.getAuctionId();
-						if (localAuctionId.equals(hasId) || localAuctionId == hasId) {
+						String hasId = hasgoodsBrief.getAuctionId();
+						if (TaoBaoUtil.isEqual(localAuctionId,hasId)) {
 							existence = 1; // 瀛樺湪鍟嗗搧涓�
 						}
 					}
@@ -1038,7 +1026,7 @@
 			}
 
 			// 鎻掑叆鍟嗗搧闆嗗悎
-			List<Long> listAuctionId = new ArrayList<Long>();
+			List<String> listAuctionId = new ArrayList<>();
 			for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {
 				listAuctionId.add(goodsBrief.getAuctionId());
 			}
@@ -1069,7 +1057,7 @@
 				map.put("goodsSource", 1);
 
 				/* 鍒稿悗浠�--璁$畻 */
-				BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+				BigDecimal couponPrice = TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief);
 				map.put("couponPrice", couponPrice);
 
 				/* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
@@ -1085,13 +1073,13 @@
 				int existence = 0;
 
 				/* 鏌ヨ鍟嗗搧鏄惁宸插瓨鍦ㄥ晢鍝佺簿閫夊簱涓� */
-				Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
+				String localAuctionId = taoBaoGoodsBrief.getAuctionId();
 				if (localAuctionId != null) {
 					if (listHas != null && listHas.size() > 0) {
 						for (QualityFactory selectionGoods : listHas) {
 							TaoBaoGoodsBrief hasgoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
-							Long hasId = hasgoodsBrief.getAuctionId();
-							if (localAuctionId.equals(hasId) || localAuctionId == hasId) {
+							String hasId = hasgoodsBrief.getAuctionId();
+							if ( TaoBaoUtil.isEqual(localAuctionId,hasId)) {
 								existence = 1; // 瀛樺湪鍟嗗搧涓�
 							}
 						}

--
Gitblit v1.8.0