From b3dd60306a2a8d7481c4de103467a351ecf7a685 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期六, 15 十二月 2018 16:03:50 +0800
Subject: [PATCH] 商品记录表定时清空

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserGoodsStorageServiceImpl.java |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 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 3d9b3fd..89e4e34 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
@@ -322,31 +326,47 @@
 			throw new UserGoodsStorageException(1, "閫夊搧搴撳晢鍝佷笉瀛樺湪");
 		}
 		
+		
+		List<UserGoodsStorage> listResult = new ArrayList<UserGoodsStorage>();
+		// 杩樺師椤哄簭 鐢ㄤ簬鍒跺浘
+		for (Long sid: listStorageID) {
+			for (UserGoodsStorage torage: listStorage) {
+				Long id = torage.getId();
+				if (sid == id || sid.equals(id)) {
+					listResult.add(torage);
+					break;
+				}
+			}
+		}
+		
+		
 		BigDecimal totalMoney = new BigDecimal(0.00);
 		List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
 		
-		for (UserGoodsStorage userGoodsStorage: listStorage) {
+		String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
+		
+		for (UserGoodsStorage userGoodsStorage: listResult) {
 			CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
 			TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
 			listGoodsBrief.add(goodsBrief);
-			// 宸插垎浜�
-			userGoodsStorage.setState(1);
-			userGoodsStorage.setUpdateTime(new Date());
 			
-			String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
 			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, listGoodsBrief);
-
-		// 鏇存柊涓哄凡鍒嗕韩
-		userGoodsStorageMapper.updateBatchSelective(listStorage);
+		
+		JSONObject result = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage, 
+				null, listGoodsBrief);
 		
 		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