From 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期六, 05 一月 2019 14:45:10 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 16 ----------------
1 files changed, 0 insertions(+), 16 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 4a73724..9192eb4 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
@@ -572,8 +572,6 @@
@Override
public JSONObject getGoodsGroupDetail(Long recordId) throws UserShareGoodsRecordException {
- List<CommonGoods> listUpadteCommonGoods = new ArrayList<CommonGoods>();
-
JSONArray array = new JSONArray();
List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId);
@@ -648,20 +646,6 @@
data.put("title", title);
data.put("count", list.size());
data.put("result_list", array);
-
- if (listUpadteCommonGoods.size() > 0) {
- executor.execute(new Runnable() {
- @Override
- public void run() {
- try {
- // 鏇存柊绠�鐗堜俊鎭�
- commonGoodsService.updateBatchCommonGoods(listUpadteCommonGoods);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
- }
return data;
}
--
Gitblit v1.8.0