From dadacf7c1065876248bec86cf17c06ca4be1b97c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 30 七月 2019 14:55:17 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
index 47bd6f4..914f5f6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/dataoke/DaTaoKeGoodsDetailServiceImpl.java
@@ -167,6 +167,18 @@
 		return list;
 	}
 
+	private void updateGoods(Long id) {
+		DaTaoKeDetail detail = daTaoKeDetailMapper.selectByPrimaryKey(id);
+		if (detail != null)
+			return;
+		detail = DaTaoKeApiUtil.getGoodsDetailV1(id);
+		if (detail != null) {
+			List<DaTaoKeDetail> list = new ArrayList<>();
+			list.add(detail);
+			addGoodsList(list);
+		}
+	}
+
 	@Cacheable(value = "daTaoKeGoodsCache", key = "'getDingDongQiangData-'+#time")
 	@Override
 	public List<DaTaoKeDetail> getDingDongQiangData(String time) {
@@ -182,7 +194,18 @@
 			List<Long> idList = new ArrayList<>();
 			for (DaTaoKeDetail td : dto.getGoodsList())
 				idList.add(td.getId());
-			return listByIds(idList);
+			List<DaTaoKeDetail> finalList = listByIds(idList);
+			if (finalList.size() != idList.size()) {
+				for (Long id : idList)
+					updateGoods(id);
+				finalList = listByIds(idList);
+			}
+
+			for (DaTaoKeDetail detail : finalList) {
+				detail.setQuanReceive(
+						detail.getQuanSurplus() + detail.getQuanReceive() - (int) (200 + Math.random() * 1000));
+			}
+			return finalList;
 		}
 		return null;
 	}

--
Gitblit v1.8.0