From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java | 28 +++++++++++-----------------
1 files changed, 11 insertions(+), 17 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 efa5178..fd6eb07 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
@@ -4,22 +4,19 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.yeshi.utils.JsonUtil;
+import org.yeshi.utils.entity.FileUploadResult;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.dao.mybatis.user.UserGoodsStorageMapper;
-import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
+import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -38,6 +35,9 @@
import com.yeshi.fanli.util.factory.CommonGoodsFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
@Service
public class UserGoodsStorageServiceImpl implements UserGoodsStorageService {
@@ -131,11 +131,6 @@
return userGoodsStorageMapper.countQueryByUid(uid);
}
- @Override
- public void updateShareStateByCommonGoodsId(Long commonGoodsId) {
- userGoodsStorageMapper.updateShareStateByCommonGoodsId(commonGoodsId);
- }
-
@Override
public void save(Long uid, Set<Long> auctionIds) throws UserGoodsStorageException {
@@ -323,15 +318,14 @@
totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
}
- String revenue = listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼"+totalMoney;
-
- Map<String,Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
- null, listGoodsBrief);
+ ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorage(uid, listGoodsBrief, listStorageID);
+ FileUploadResult uploadResult = new FileUploadResult();
+ uploadResult.setUrl(shareRecord.getSharePictureUrl());
JSONObject data = new JSONObject();
- data.put("revenue", revenue);
- data.put("shareId", map.get("shareId"));
- data.put("shareImg", map.get("loadResult"));
+ data.put("revenue", listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼"+totalMoney);
+ data.put("shareId", shareRecord.getRedisKey());
+ data.put("shareImg", uploadResult);
data.put("notifyDesc", configService.get("goods_share_multiple_notify"));
return data;
--
Gitblit v1.8.0