From ebce479a2d0634c90e5f80045e204248336b410d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 30 五月 2019 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
index 19fb9e8..5796e36 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -99,10 +99,10 @@
UserShareGoodsHistory update = new UserShareGoodsHistory();
update.setId(userShareGoodsHistory.getId());
userShareGoodsHistory.setTkCode(history.getTkCode());
+ userShareGoodsHistory.setCreateTime(new Date());
userShareGoodsHistoryMapper.updateByPrimaryKeySelective(userShareGoodsHistory);
} else
userShareGoodsHistoryMapper.insertSelective(history);
-
}
@Override
@@ -390,6 +390,8 @@
}
TaoBaoGoodsBrief goods = null;
try {
+ //娴嬭瘯
+// info.setAdzoneId("123");
goods = TaoKeApiUtil.searchGoodsDetail(auctionId, info);
} catch (TaobaoGoodsDownException e) {
throw new ShareGoodsException(4, "鍟嗗搧宸蹭笅鏋�");
--
Gitblit v1.8.0