From ec6389a5f15c729a0a76577de04b61e602db0663 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 10:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index 0a3b97f..3fab29c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
@@ -172,7 +172,7 @@
public void run() {
shareGoodsService.addShareGoodsHistory(history);
try {
- userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, taoBaoLink.getGoods());
+ userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.goodsDetail, null,taoBaoLink.getGoods());
} catch (UserShareGoodsRecordException e) {
e.printStackTrace();
}
@@ -251,7 +251,7 @@
}
try {
- JSONObject data = userShareGoodsGroupService.getGoodsGroup(recordId);
+ JSONObject data = userShareGoodsRecordService.getGoodsGroup(recordId);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("鍔犺浇澶辫触"));
--
Gitblit v1.8.0