From 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 五月 2019 10:28:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
index 0cf36cb..0bc0b08 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -329,8 +329,6 @@
return map;
}
-
-
/**
* 淇濆瓨鍒嗕韩璁板綍
@@ -377,7 +375,7 @@
return shareInfo;
}
-
+
/**
* 鍗曚釜鍟嗗搧鍒嗕韩鐢熸垚璁板綍
@@ -808,7 +806,17 @@
executor.execute(new Runnable() {
@Override
public void run() {
- userGoodsStorageService.updateShareState(shareId);
+ List<UserShareGoodsGroup> listgoods = userShareGoodsGroupService.listByRecordId(shareId);
+ if (listgoods != null && listgoods.size() > 0) {
+
+ for (UserShareGoodsGroup userShareGoodsGroup: listgoods) {
+ CommonGoods commonGoods = userShareGoodsGroup.getCommonGoods();
+ if (commonGoods == null) {
+ continue;
+ }
+ userGoodsStorageService.updateShareStateByCommonGoodsId(commonGoods.getId());
+ }
+ }
}
});
}
--
Gitblit v1.8.0