From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java |   84 ++++++++++++++++++------------------------
 1 files changed, 36 insertions(+), 48 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 7acb40e..53e7dfe 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
@@ -4,6 +4,7 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -105,11 +106,6 @@
 		return userShareGoodsRecordMapper.updateByPrimaryKeySelective(record);
 	}
 
-	@Override
-	public int updateByPrimaryKey(UserShareGoodsRecord record) {
-		return userShareGoodsRecordMapper.updateByPrimaryKey(record);
-	}
-
 
 	@Override
 	public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source) {
@@ -143,6 +139,14 @@
 				userShareGoodsRecord.setCreateTime(null);
 				userShareGoodsRecord.setUpdateTime(null);
 				listId.add(userShareGoodsRecord.getId());
+				
+				// 鏀瑰彉鍥剧墖灏哄
+				String pictUrl = userShareGoodsRecord.getPicture();
+				if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
+					userShareGoodsRecord.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
+				}
+				
+				
 			}
 			
 			// 浠婃棩娴忚缁熻
@@ -258,7 +262,7 @@
 	 * @throws UserShareGoodsRecordException
 	 */
 	@Override
-	public JSONObject save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {
+	public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {
 		
 		if (listGoods == null || listGoods.size() < 0) {
 			throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻");
@@ -286,13 +290,13 @@
 		userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
 		
 		
-		JSONObject data = new JSONObject();
+		Map<String,Object> map = new HashMap<String,Object>();
 		// 澶氫釜鍟嗗搧鍒嗕韩
 		FileUploadResult loadResult = multipleGoodsShare(userShareGoodsRecord, listGoods);
-		data.put("loadResult", loadResult);
-		data.put("shareId", userShareGoodsRecord.getId());
+		map.put("loadResult", loadResult);
+		map.put("shareId", userShareGoodsRecord.getId());
 		
-		return data;
+		return map;
 	}
 	
 	/**
@@ -312,33 +316,23 @@
 				return;
 			}
 			
-			UserShareGoodsGroup shareGoodsGroup = null;
 			
 			UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),
 					userShareGoodsRecord.getUid());
-			if (singleGoods != null && singleGoods.getTotalGoods() == 1) {
-				// 鍚屼竴涓晢鍝佸娆″垎浜�
-				shareGoodsGroup = singleGoods;
-			}	
 			
-			if (shareGoodsGroup != null) {
+			if (singleGoods != null) {
 				// 鍗曚釜鍟嗗搧澶氭鍒嗕韩
 				userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());
-				userShareGoodsRecord.setId(shareGoodsGroup.getRecordId());
+				userShareGoodsRecord.setId(singleGoods.getRecordId());
 				userShareGoodsRecord.setUpdateTime(new Date());
-				userShareGoodsRecordMapper.updateByPrimaryKey(userShareGoodsRecord);
+				userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);
 				
-				Integer totalOrder = shareGoodsGroup.getTotalOrder();
-				if (totalOrder == null ||totalOrder == 0 || totalOrder.equals(0)) {
-					// 棰勮閲戦
-					String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
-					shareGoodsGroup.setUpdateTime(new Date());
-					BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr));
-					shareGoodsGroup.setTotalMoney(money);
-					
-					userShareGoodsGroupService.updateByPrimaryKeySelective(shareGoodsGroup);
-				}
-			} else {
+				// 鏈�鏂板晢鍝�
+				singleGoods.setUpdateTime(new Date());
+				userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);
+				
+			} else 
+			{
 				// 鍗曚釜鍟嗗搧绗竴娆″垎浜�
 				Date date = new Date();
 				userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());
@@ -346,21 +340,17 @@
 				userShareGoodsRecord.setUpdateTime(date);
 				userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
 				
-				shareGoodsGroup = new UserShareGoodsGroup();
-				shareGoodsGroup.setTotalOrder(0);
-				shareGoodsGroup.setTotalBrowse(0);
-				shareGoodsGroup.setTodayBrowse(0);
-				shareGoodsGroup.setCreateTime(date);
-				shareGoodsGroup.setUpdateTime(date);
-				shareGoodsGroup.setCommonGoods(resultCommonGoods);
-				shareGoodsGroup.setRecordId(userShareGoodsRecord.getId());
+				singleGoods = new UserShareGoodsGroup();
+				singleGoods.setTotalOrder(0);
+				singleGoods.setTotalBrowse(0);
+				singleGoods.setTodayBrowse(0);
+				singleGoods.setTotalMoney(new BigDecimal(0));
+				singleGoods.setCreateTime(date);
+				singleGoods.setUpdateTime(date);
+				singleGoods.setCommonGoods(resultCommonGoods);
+				singleGoods.setRecordId(userShareGoodsRecord.getId());
 				
-				// 棰勮閲戦
-				String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
-				BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr));
-				shareGoodsGroup.setTotalMoney(money);
-				
-				userShareGoodsGroupService.insertSelective(shareGoodsGroup);
+				userShareGoodsGroupService.insertSelective(singleGoods);
 			}
 			
 		} catch (CommonGoodsException e) {
@@ -380,7 +370,6 @@
 		
 		// 鍒嗕韩璁板綍
 		Date date = new Date();
-		String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
 		
 		List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
 		List<UserShareGoodsGroup> listGroup = new ArrayList<UserShareGoodsGroup>();
@@ -400,14 +389,12 @@
 				shareGoodsGroup.setTotalOrder(0);
 				shareGoodsGroup.setTotalBrowse(0);
 				shareGoodsGroup.setTodayBrowse(0);
+				shareGoodsGroup.setTotalMoney(new BigDecimal(0));
 				shareGoodsGroup.setCreateTime(date);
 				shareGoodsGroup.setUpdateTime(date);
 				shareGoodsGroup.setCommonGoods(resultCommonGoods);
 				shareGoodsGroup.setRecordId(userShareGoodsRecord.getId());
 				
-				// 棰勮閲戦
-				BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr));
-				shareGoodsGroup.setTotalMoney(money);
 				
 				listGroup.add(shareGoodsGroup);
 				
@@ -440,7 +427,7 @@
 		
 		Long uid = shareRecord.getUid();
 		Long shareId = shareRecord.getId();
-		String source = shareRecord.getSource().getDesc();
+		String source = shareRecord.getSource().name();
 		
 		String url = String.format("http://%s/share_mushGoods.html?uid=%s&shareId=%s&source=%s", configService.getH5Host(),
 				AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareRecord.getId() + "", source +"");
@@ -655,6 +642,7 @@
 					    			goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
 					    		
 					    			goodsState = 0;
+					    			goodsBrief.setState(goodsState); // 鍦ㄥ敭
 					    			
 					    			CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);
 					    			upadeteCommonGoods.setState(goodsState);

--
Gitblit v1.8.0