From 205f8ba403095b4894d026f800d2651223c19d00 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 17:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
index c66d4eb..358ea32 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java
@@ -14,7 +14,6 @@
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.entity.FileUploadResult;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -129,6 +128,11 @@
@Override
public long countQueryByUid(Long uid) {
return userGoodsStorageMapper.countQueryByUid(uid);
+ }
+
+ @Override
+ public void updateShareState(Long shareId) {
+ userGoodsStorageMapper.updateShareState(shareId);
}
@Override
@@ -331,24 +335,20 @@
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
listGoodsBrief.add(goodsBrief);
- // 宸插垎浜�
- userGoodsStorage.setState(1);
- userGoodsStorage.setUpdateTime(new Date());
BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(rateStr));
totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
}
String revenue = listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼"+totalMoney;
- FileUploadResult loadResult = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
+
+ JSONObject result = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
null, listGoodsBrief);
-
- // 鏇存柊涓哄凡鍒嗕韩
- userGoodsStorageMapper.updateBatchSelective(listStorage);
JSONObject data = new JSONObject();
- data.put("shareImg", loadResult);
data.put("revenue", revenue);
+ data.put("shareId", result.get("shareId"));
+ data.put("shareImg", result.get("loadResult"));
data.put("notifyDesc", configService.get("goods_share_notify"));
return data;
--
Gitblit v1.8.0