From 1a8fd056235eaf09c7eb5ecc68fd95b585e079be Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 16:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
index c87fc77..f656e57 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -336,13 +336,13 @@
public List<DynamicInfo> query(int start, int count, Long cid, Long subId) {
List<DynamicInfo> list = dynamicInfoDao.query(start, count, cid, subId);
-// // 鏇存柊鍟嗗搧淇℃伅
-// executor.execute(new Runnable() {
-// @Override
-// public void run() {
-// updateGoodInfo(list);
-// }
-// });
+ // 鏇存柊鍟嗗搧淇℃伅
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ updateGoodInfo(list);
+ }
+ });
return list;
}
@@ -505,6 +505,10 @@
taoBaoGoodsBriefExtra.setCouponInfo(null);
taoBaoGoodsBriefExtra.setUpdatetime(new Date());
+ if (!taoBaoGoodsBriefExtra.isCoupon()) {
+ taoBaoGoodsBriefExtra.setState(1);
+ }
+
String goodsId = goodsBrief.getAuctionId().toString();
JSONObject item = new JSONObject();
item.put("id", goodsId);
--
Gitblit v1.8.0