From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java |  809 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 538 insertions(+), 271 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 0cf36cb..4e138c4 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,9 +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;
 
 import javax.annotation.Resource;
 
@@ -26,12 +24,17 @@
 import com.google.gson.GsonBuilder;
 import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
 import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsRecordMapper;
-import com.yeshi.fanli.dto.share.ShareInfoDTO;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
+import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
+import com.yeshi.fanli.entity.accept.AcceptData;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
+import com.yeshi.fanli.entity.bus.user.UserGoodsStorage;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
 import com.yeshi.fanli.entity.goods.CommonGoods;
+import com.yeshi.fanli.entity.jd.JDGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.exception.goods.CommonGoodsException;
@@ -40,14 +43,17 @@
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.service.inter.config.ConfigService;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.user.UserAccountService;
 import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
 import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
 import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
 import com.yeshi.fanli.util.AESUtil;
 import com.yeshi.fanli.util.Constant;
+import com.yeshi.fanli.util.FilePathEnum;
 import com.yeshi.fanli.util.ImageUtil;
+import com.yeshi.fanli.util.RedisKeyEnum;
 import com.yeshi.fanli.util.RedisManager;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.factory.CommonGoodsFactory;
@@ -90,6 +96,9 @@
 	@Resource
 	private UserGoodsStorageService userGoodsStorageService;
 
+	@Resource
+	private IntegralGetService integralGetService;
+
 	@Override
 	public int insert(UserShareGoodsRecord record) {
 		return userShareGoodsRecordMapper.insert(record);
@@ -118,6 +127,11 @@
 	@Override
 	public long countQueryByUid(Long uid, String source) {
 		return userShareGoodsRecordMapper.countQueryByUid(uid, source);
+	}
+
+	@Override
+	public List<UserShareGoodsGroup> listByRecordId(Long shareId) {
+		return userShareGoodsGroupService.listByRecordId(shareId);
 	}
 
 	@Override
@@ -198,6 +212,28 @@
 							}
 						}
 					}
+
+					String shareType = shareRecord.getShareType();
+					if (StringUtil.isNullOrEmpty(shareType)) {
+						shareRecord.setShareType(UserShareGoodsRecord.SHARETYPE_SINGLE);
+					}
+
+					BigDecimal totalMoney = shareRecord.getTotalMoney();
+					if (totalMoney == null) {
+						shareRecord.setTotalMoney(new BigDecimal(0));
+					}
+				}
+			} else {
+				for (UserShareGoodsRecord shareRecord : list) {
+					String shareType = shareRecord.getShareType();
+					if (StringUtil.isNullOrEmpty(shareType)) {
+						shareRecord.setShareType(UserShareGoodsRecord.SHARETYPE_SINGLE);
+					}
+
+					BigDecimal totalMoney = shareRecord.getTotalMoney();
+					if (totalMoney == null) {
+						shareRecord.setTotalMoney(new BigDecimal(0));
+					}
 				}
 			}
 		}
@@ -206,9 +242,8 @@
 	}
 
 	@Override
-	public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException {
-
-		if (auctionId == null) {
+	public void saveSingleShareRecord(Long uid, Long goodsId, Integer goodsType) throws UserShareGoodsRecordException {
+		if (goodsId == null) {
 			throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖");
 		}
 
@@ -216,248 +251,96 @@
 			throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
 		}
 
-		TaoBaoGoodsBrief goodsBrief = null;
-		try {
-			goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
-		} catch (TaobaoGoodsDownException e) {
-			throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+		if (goodsType == null) {
+			goodsType = Constant.SOURCE_TYPE_TAOBAO;
+		}
+
+		CommonGoods convertGoods = null;
+		if (goodsType == Constant.SOURCE_TYPE_JD) {
+			JDGoods jdGoods = redisManager.getJDGoods(goodsId);
+			if (jdGoods == null) {
+				throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+			}
+			convertGoods = CommonGoodsFactory.create(jdGoods);
+		} else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+			PDDGoodsDetail pddGoods = redisManager.getPDDGoodsDetail(goodsId);
+			if (pddGoods == null) {
+				throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+			}
+			convertGoods = CommonGoodsFactory.create(pddGoods);
+		} else {
+			TaoBaoGoodsBrief goodsBrief = null;
+			try {
+				goodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);
+			} catch (TaobaoGoodsDownException e) {
+				throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
+			}
+			convertGoods = CommonGoodsFactory.create(goodsBrief);
 		}
 
 		UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();
 		userShareGoodsRecord.setUid(uid);
 		userShareGoodsRecord.setSource(ShareSourceTypeEnum.goodsDetail);
-		userShareGoodsRecord.setShareState(1);// 宸插垎浜垚鍔�
-		// 鍗曚釜鍟嗗搧鍒嗕韩
-		singleGoodsShare(userShareGoodsRecord, goodsBrief);
-	}
+		userShareGoodsRecord.setShareState(1);
 
-	
-	@Override
-	public Long saveSingleShareRecord(Long uid, Long auctionId) throws UserShareGoodsRecordException {
-
-		if (auctionId == null) {
-			throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖");
-		}
-
-		if (uid == null) {
-			throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
-		}
-
-		TaoBaoGoodsBrief goodsBrief = null;
+		convertGoods.setState(0);
+		CommonGoods resultCommonGoods = null;
 		try {
-			goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
-		} catch (TaobaoGoodsDownException e) {
-			throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�");
-		}
-
-		UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();
-		userShareGoodsRecord.setUid(uid);
-		userShareGoodsRecord.setSource(ShareSourceTypeEnum.goodsDetail);
-		userShareGoodsRecord.setShareState(0);
-		// 鍗曚釜鍟嗗搧鍒嗕韩
-		singleGoodsShare(userShareGoodsRecord, goodsBrief);
-		
-		return userShareGoodsRecord.getId();
-	}
-	
-	@Override
-	public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief)
-			throws UserShareGoodsRecordException {
-
-		if (taoBaoGoodsBrief == null) {
-			throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖");
-		}
-
-		if (uid == null) {
-			throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
-		}
-
-		if (source == null) {
-			throw new UserShareGoodsRecordException(1, "鍒嗕韩鏉ユ簮涓嶈兘涓虹┖");
-		}
-
-		UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();
-		userShareGoodsRecord.setUid(uid);
-		userShareGoodsRecord.setSource(source);
-		userShareGoodsRecord.setTitle(title);
-		// 鍗曚釜鍟嗗搧鍒嗕韩
-		singleGoodsShare(userShareGoodsRecord, taoBaoGoodsBrief);
-	}
-
-	/**
-	 * 淇濆瓨鍒嗕韩璁板綍
-	 * 
-	 * @param userShareGoodsRecord
-	 *            鍒嗕韩璁板綍锛� uid銆乸icture銆乻ource 涓哄繀杈撳叆
-	 * @throws UserShareGoodsRecordException
-	 */
-	@Override
-	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, "鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻");
-		}
-
-		if (uid == null) {
-			throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
-		}
-
-		if (source == null) {
-			throw new UserShareGoodsRecordException(1, "鍒嗕韩鏉ユ簮涓嶈兘涓虹┖");
-		}
-
-		UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();
-		userShareGoodsRecord.setUid(uid);
-		userShareGoodsRecord.setSource(source);
-		userShareGoodsRecord.setTitle(title);
-		// 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
-		userShareGoodsRecord.setPicture(listGoods.get(0).getPictUrl());
-
-		Date date = new Date();
-		userShareGoodsRecord.setShareState(0); // 鍒濆鏈垎浜�
-		userShareGoodsRecord.setCreateTime(date);
-		userShareGoodsRecord.setUpdateTime(date);
-		userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
-
-		Map<String, Object> map = new HashMap<String, Object>();
-		// 澶氫釜鍟嗗搧鍒嗕韩
-		FileUploadResult loadResult = multipleGoodsShare(userShareGoodsRecord, listGoods);
-		map.put("loadResult", loadResult);
-		map.put("shareId", userShareGoodsRecord.getId());
-
-		return map;
-	}
-	
-	
-	
-
-	/**
-	 * 淇濆瓨鍒嗕韩璁板綍
-	 * 
-	 * @param userShareGoodsRecord
-	 *            鍒嗕韩璁板綍锛� uid銆乸icture銆乻ource 涓哄繀杈撳叆
-	 * @throws UserShareGoodsRecordException
-	 */
-	@Override
-	public ShareInfoDTO saveShareRecord(Long uid, ShareSourceTypeEnum source, String title,
-			List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {
-
-		if (listGoods == null || listGoods.size() == 0) {
-			throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻");
-		}
-
-		if (uid == null) {
-			throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖");
-		}
-
-		if (source == null) {
-			throw new UserShareGoodsRecordException(1, "鍒嗕韩鏉ユ簮涓嶈兘涓虹┖");
-		}
-
-		UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();
-		userShareGoodsRecord.setUid(uid);
-		userShareGoodsRecord.setSource(source);
-		userShareGoodsRecord.setTitle(title);
-		// 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
-		userShareGoodsRecord.setPicture(listGoods.get(0).getPictUrl());
-
-		Date date = new Date();
-		userShareGoodsRecord.setShareState(0); // 鍒濆鏈垎浜�
-		userShareGoodsRecord.setCreateTime(date);
-		userShareGoodsRecord.setUpdateTime(date);
-		userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
-
-		// 澶氫釜鍟嗗搧鍒嗕韩
-		 multipleGoodsShareRecord(userShareGoodsRecord, listGoods);
-	
-		ShareInfoDTO shareInfo = new ShareInfoDTO();
-		shareInfo.setShareId(userShareGoodsRecord.getId());
-		shareInfo.setShareUrl(getShareUrl(userShareGoodsRecord));
-		
-		return shareInfo;
-	}
-
-
-	/**
-	 * 鍗曚釜鍟嗗搧鍒嗕韩鐢熸垚璁板綍
-	 * 
-	 * @param userShareGoodsRecord
-	 * @param taoBaoGoodsBrief
-	 */
-	@Transactional
-	public void singleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, TaoBaoGoodsBrief taoBaoGoodsBrief) {
-
-		CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief);
-		commonGoods.setState(taoBaoGoodsBrief.getState());
-		try {
-			CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);
-
-			if (resultCommonGoods == null) {
-				return;
-			}
-
-			UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),
-					userShareGoodsRecord.getUid());
-
-			if (singleGoods != null) {
-				// 鍗曚釜鍟嗗搧澶氭鍒嗕韩
-				userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());
-				userShareGoodsRecord.setId(singleGoods.getRecordId());
-				userShareGoodsRecord.setUpdateTime(new Date());
-				userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);
-
-				// 鏈�鏂板晢鍝�
-				singleGoods.setUpdateTime(new Date());
-				userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);
-
-			} else {
-				// 鍗曚釜鍟嗗搧绗竴娆″垎浜�
-				Date date = new Date();
-				userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());
-				userShareGoodsRecord.setCreateTime(date);
-				userShareGoodsRecord.setUpdateTime(date);
-				userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
-
-				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());
-
-				userShareGoodsGroupService.insertSelective(singleGoods);
-			}
-
+			resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(convertGoods);
 		} catch (CommonGoodsException e) {
-			e.printStackTrace();
+			throw new UserShareGoodsRecordException(1, "鍟嗗搧瀛樺叆澶辫触");
 		}
 
+		UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),
+				userShareGoodsRecord.getUid());
+
+		if (singleGoods != null) {
+			// 鍗曚釜鍟嗗搧澶氭鍒嗕韩
+			userShareGoodsRecord.setPicture(resultCommonGoods.getPicture());
+			userShareGoodsRecord.setId(singleGoods.getRecordId());
+			userShareGoodsRecord.setUpdateTime(new Date());
+			userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);
+
+			// 鏈�鏂板晢鍝�
+			singleGoods.setUpdateTime(new Date());
+			userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);
+
+		} else {
+			// 鍗曚釜鍟嗗搧绗竴娆″垎浜�
+			Date date = new Date();
+			userShareGoodsRecord.setPicture(resultCommonGoods.getPicture());
+			userShareGoodsRecord.setCreateTime(date);
+			userShareGoodsRecord.setUpdateTime(date);
+			userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
+
+			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());
+			userShareGoodsGroupService.insertSelective(singleGoods);
+		}
 	}
 
-	
 	/**
 	 * 澶氫釜鍟嗗搧鍒嗕韩鐢熸垚璁板綍
 	 * 
 	 * @param userShareGoodsRecord
 	 * @param listGoods
 	 */
-	@Transactional
-	public void multipleGoodsShareRecord(UserShareGoodsRecord userShareGoodsRecord,
-			List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {
-
+	@Transactional(rollbackFor = Exception.class)
+	public void multipleGoodsShareRecord(Long shareId, List<CommonGoods> listGoods)
+			throws UserShareGoodsRecordException {
 		// 鍒嗕韩璁板綍
 		Date date = new Date();
-
 		List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
 		List<UserShareGoodsGroup> listGroup = new ArrayList<UserShareGoodsGroup>();
 
-		for (TaoBaoGoodsBrief taoBaoGoodsBrief : listGoods) {
-			CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief);
-			commonGoods.setState(taoBaoGoodsBrief.getState());
+		for (CommonGoods commonGoods : listGoods) {
 			try {
 				CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods);
 
@@ -474,13 +357,10 @@
 				shareGoodsGroup.setCreateTime(date);
 				shareGoodsGroup.setUpdateTime(date);
 				shareGoodsGroup.setCommonGoods(resultCommonGoods);
-				shareGoodsGroup.setRecordId(userShareGoodsRecord.getId());
-
+				shareGoodsGroup.setRecordId(shareId);
 				listGroup.add(shareGoodsGroup);
-
 			} catch (CommonGoodsException e) {
 				e.printStackTrace();
-				continue;
 			}
 		}
 
@@ -488,14 +368,14 @@
 			userShareGoodsGroupService.insertBatch(listGroup);
 		}
 	}
-	
+
 	/**
 	 * 澶氫釜鍟嗗搧鍒嗕韩鐢熸垚璁板綍
 	 * 
 	 * @param userShareGoodsRecord
 	 * @param listGoods
 	 */
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord,
 			List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {
 
@@ -543,22 +423,6 @@
 		return shareImg;
 	}
 
-	public String  getShareUrl (UserShareGoodsRecord shareRecord) {
-		Long uid = shareRecord.getUid();
-		Long shareId = shareRecord.getId();
-		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), shareId + "",
-				source + "");
-
-		String shortLink = HttpUtil.getShortLink(url);
-		if (!StringUtil.isNullOrEmpty(shortLink)) {
-			url = shortLink;
-		}
-		return url;
-	}
-	
 	/**
 	 * 鐢熸垚鍒嗕韩鍥�
 	 * 
@@ -597,7 +461,7 @@
 		}
 
 		// 鑾峰彇鍒扮敤鎴风殑澶村儚
-		UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
+		UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);
 		if (user == null) {
 			throw new UserShareGoodsRecordException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
 		}
@@ -625,7 +489,8 @@
 		InputStream inputStream = ImageUtil.drawGoodsShareBigImg(erCodeInputStream, portrait, listGoods);
 
 		FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,
-				"sharegoods/share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");
+				FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis()
+						+ ".png");
 
 		return shareImg;
 	}
@@ -661,7 +526,8 @@
 		Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 				.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 
-		BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());
+		BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
+				java.lang.System.currentTimeMillis());
 
 		for (UserShareGoodsGroup goodsGroup : list) {
 			CommonGoods commonGoods = goodsGroup.getCommonGoods();
@@ -746,7 +612,8 @@
 			Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
 					.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
 
-			BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());
+			BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
+					java.lang.System.currentTimeMillis());
 
 			for (UserShareGoodsGroup goodsGroup : list) {
 				CommonGoods commonGoods = goodsGroup.getCommonGoods();
@@ -795,26 +662,426 @@
 	}
 
 	@Override
-	public void updateShareRecord(Long shareId) throws UserShareGoodsRecordException {
-		UserShareGoodsRecord shareRecord = userShareGoodsRecordMapper.selectByPrimaryKey(shareId);
-		if (shareRecord == null) {
-			throw new UserShareGoodsRecordException(1, "鍒嗕韩璁板綍涓嶅瓨鍦�");
-		}
-
-		shareRecord.setShareState(1);// 鍒嗕韩鐢熸晥
-		updateByPrimaryKeySelective(shareRecord);// 鏇存柊鍟嗗搧涓哄凡鍒嗕韩
-		
-		// 鏇存柊閫夊搧搴撳晢鍝佷负宸插垎浜�
-		executor.execute(new Runnable() {
-			@Override
-			public void run() {
-				userGoodsStorageService.updateShareState(shareId);
-			}
-		});
-	}
-
-	@Override
 	public long countShareRecordByUid(Long uid) {
 		return userShareGoodsRecordMapper.countQueryByUid(uid, null);
 	}
+
+	@Override
+	public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType, boolean isTaolijin)
+			throws UserShareGoodsRecordException {
+		if (auctionId == null || uid == null || uid <= 0) {
+			throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝g‘");
+		}
+
+		ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
+		recordDTO.setUid(uid);
+		recordDTO.setAuctionId(auctionId);
+		recordDTO.setGoodsType(goodsType);
+		recordDTO.setTaolijin(isTaolijin);
+		recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);
+
+		// 鍒嗕韩id
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey,
+				StringUtil.Md5(uid + "#GoodsDetail#" + auctionId + "#Type#" + goodsType));
+		redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
+		recordDTO.setRedisKey(key);
+
+		return recordDTO;
+	}
+
+	@Override
+	public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief,
+			List<Long> listStorageID) throws UserShareGoodsRecordException {
+		if (uid == null || uid <= 0 || listGoodsBrief == null || listGoodsBrief.size() == 0) {
+			throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝g‘");
+		}
+		// 鎻掑叆璁板綍
+		UserShareGoodsRecord record = new UserShareGoodsRecord();
+		record.setUid(uid);
+		record.setShareState(0); // 鍒濆鏈垎浜�
+		record.setSource(ShareSourceTypeEnum.storage);
+		record.setPicture(listGoodsBrief.get(0).getPictUrl()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
+		record.setCreateTime(new Date());
+		userShareGoodsRecordMapper.insertSelective(record);
+
+		List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();
+		for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {
+			listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));
+		}
+
+		Long id = record.getId();
+		// 鍒嗕韩閾炬帴
+		String shareUrl = getShareUrl(record);
+		// 鍒嗕韩浜岀淮鐮侀摼鎺�
+		FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listCommonGoods);
+
+		ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
+		recordDTO.setUid(uid);
+		recordDTO.setShareId(id);
+		recordDTO.setShareUrl(shareUrl);
+		recordDTO.setListId(listStorageID);
+		recordDTO.setListGoods(listCommonGoods);
+		recordDTO.setSharePictureUrl(uploadResult.getUrl());
+		recordDTO.setSource(ShareSourceTypeEnum.storage);
+
+		// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#GoodsStorage#" + id));
+		recordDTO.setRedisKey(key);
+
+		redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
+
+		return recordDTO;
+	}
+
+	@Override
+	public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<CommonGoods> listGoods, List<Long> listStorageID,
+			boolean needDrawPicture) throws UserShareGoodsRecordException {
+		if (uid == null || uid <= 0 || listGoods == null || listGoods.size() == 0) {
+			throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝g‘");
+		}
+		// 鎻掑叆璁板綍
+		UserShareGoodsRecord record = new UserShareGoodsRecord();
+		record.setUid(uid);
+		record.setShareState(0); // 鍒濆鏈垎浜�
+		record.setSource(ShareSourceTypeEnum.storage);
+		record.setPicture(listGoods.get(0).getPicture()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
+		record.setCreateTime(new Date());
+		userShareGoodsRecordMapper.insertSelective(record);
+
+		Long id = record.getId();
+		// 鍒嗕韩閾炬帴
+		String shareUrl = getShareUrlV2(record);
+		// 鍒嗕韩浜岀淮鐮侀摼鎺�
+
+		ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
+		recordDTO.setUid(uid);
+		recordDTO.setShareId(id);
+		recordDTO.setShareUrl(shareUrl);
+		recordDTO.setListId(listStorageID);
+		recordDTO.setListGoods(listGoods);
+		if (needDrawPicture) {
+			FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoods);
+			recordDTO.setSharePictureUrl(uploadResult.getUrl());
+		}
+		recordDTO.setSource(ShareSourceTypeEnum.storage);
+
+		// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#GoodsStorage#" + id));
+		recordDTO.setRedisKey(key);
+
+		redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
+
+		return recordDTO;
+	}
+
+	@Override
+	public ShareGoodsRecordDTO addRecordActivity(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief)
+			throws UserShareGoodsRecordException {
+
+		if (uid == null || uid <= 0 || listGoodsBrief == null || listGoodsBrief.size() == 0) {
+			throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝g‘");
+		}
+
+		// 鎻掑叆璁板綍
+		UserShareGoodsRecord record = new UserShareGoodsRecord();
+		record.setUid(uid);
+		record.setShareState(0); // 鍒濆鏈垎浜�
+		record.setSource(ShareSourceTypeEnum.activity);
+		record.setPicture(listGoodsBrief.get(0).getPictUrl()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
+		record.setCreateTime(new Date());
+		userShareGoodsRecordMapper.insertSelective(record);
+
+		List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();
+		for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {
+			listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));
+		}
+
+		Long id = record.getId();
+		// 鍒嗕韩閾炬帴
+		String shareUrl = getShareUrl(record);
+		// 鍒嗕韩浜岀淮鐮侀摼鎺�
+		FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listCommonGoods);
+
+		ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
+		recordDTO.setUid(uid);
+		recordDTO.setShareId(id);
+		recordDTO.setListGoods(listCommonGoods);
+		recordDTO.setShareUrl(shareUrl);
+		recordDTO.setSharePictureUrl(uploadResult.getUrl());
+		recordDTO.setSource(ShareSourceTypeEnum.activity);
+		// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#Activity#" + id));
+		recordDTO.setRedisKey(key);
+
+		redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
+
+		return recordDTO;
+	}
+
+	@Override
+	public ShareGoodsRecordDTO addRecordDynamic(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief)
+			throws UserShareGoodsRecordException {
+		if (uid == null || uid <= 0 || listGoodsBrief == null || listGoodsBrief.size() == 0) {
+			throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝g‘");
+		}
+
+		// 鎻掑叆璁板綍
+		UserShareGoodsRecord record = new UserShareGoodsRecord();
+		record.setUid(uid);
+		record.setShareState(0); // 鍒濆鏈垎浜�
+		record.setSource(ShareSourceTypeEnum.activity);
+		record.setPicture(listGoodsBrief.get(0).getPictUrl()); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥�
+		record.setCreateTime(new Date());
+		userShareGoodsRecordMapper.insertSelective(record);
+
+		List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();
+		for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {
+			listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));
+		}
+
+		Long id = record.getId();
+		// 鍒嗕韩閾炬帴
+		String shareUrl = getShareUrl(record);
+
+		ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();
+		recordDTO.setUid(uid);
+		recordDTO.setShareId(id);
+		recordDTO.setShareUrl(shareUrl);
+		recordDTO.setListGoods(listCommonGoods);
+		recordDTO.setSource(ShareSourceTypeEnum.activity);
+
+		// 缂撳瓨鍒嗕韩鍟嗗搧淇℃伅
+		String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#Dynamic#" + id));
+		recordDTO.setRedisKey(key);
+
+		redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);
+
+		return recordDTO;
+	}
+
+	@Override
+	public void takeEffectShareRecord(AcceptData acceptData, String shareKey) throws UserShareGoodsRecordException {
+		if (StringUtil.isNullOrEmpty(shareKey)) {
+			throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝g‘");
+		}
+		ShareGoodsRecordDTO recordDTO = null;
+		String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, shareKey);
+		String value = redisManager.getCommonString(redisKey);
+		if (!StringUtil.isNullOrEmpty(value)) {
+			recordDTO = JsonUtil.getSimpleGson().fromJson(value, ShareGoodsRecordDTO.class);
+		}
+
+		if (recordDTO == null) {
+			throw new UserShareGoodsRecordException(1, "鍒嗕韩淇℃伅涓嶅瓨鍦�");
+		}
+
+		Long uid = recordDTO.getUid();
+		boolean taolijin = recordDTO.isTaolijin();
+		boolean singleGoods = true;
+		Long shareId = recordDTO.getShareId();
+		ShareSourceTypeEnum source = recordDTO.getSource();
+		if (ShareSourceTypeEnum.goodsDetail.equals(source)) {
+			// 鍟嗗搧璇︽儏鍒嗕韩
+			saveSingleShareRecord(recordDTO.getUid(), recordDTO.getAuctionId(), recordDTO.getGoodsType());
+		} else if (ShareSourceTypeEnum.activity.equals(source)) {
+			// 鍔ㄦ�佸垎浜�
+			UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();
+			shareRecord.setId(shareId);
+			shareRecord.setShareState(1);
+			shareRecord.setUpdateTime(new Date());
+			updateByPrimaryKeySelective(shareRecord);
+
+			List<CommonGoods> listGoods = recordDTO.getListGoods();
+			if (listGoods != null && listGoods.size() > 1)
+				singleGoods = false;
+
+			// 淇濆瓨鍟嗗搧淇℃伅
+			multipleGoodsShareRecord(shareId, recordDTO.getListGoods());
+
+		} else if (ShareSourceTypeEnum.storage.equals(source)) {
+			// 鍒嗕韩搴撳垎浜�
+			singleGoods = false;
+
+			UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();
+			shareRecord.setId(shareId);
+			shareRecord.setShareState(1);
+			shareRecord.setUpdateTime(new Date());
+			updateByPrimaryKeySelective(shareRecord);
+
+			// 淇濆瓨鍟嗗搧淇℃伅
+			multipleGoodsShareRecord(shareId, recordDTO.getListGoods());
+
+			// 鏇存柊閫夊搧搴撳晢鍝佺姸鎬� 涓哄凡鍒嗕韩
+			List<Long> listId = recordDTO.getListId();
+			if (listId != null && listId.size() > 0) {
+				for (Long id : listId) {
+					UserGoodsStorage userGoodsStorage = new UserGoodsStorage();
+					userGoodsStorage.setId(id);
+					userGoodsStorage.setState(1);
+					userGoodsStorageService.updateByPrimaryKeySelective(userGoodsStorage);
+				}
+			}
+		}
+
+		// 娓呯悊缂撳瓨
+		redisManager.removeCommonString(redisKey);
+
+		if (singleGoods) {
+			if (taolijin) {
+				integralGetService.addShareTLJGoods(uid);
+			} else {
+				integralGetService.addShareSingleGoods(uid);
+			}
+		} else {
+			integralGetService.addShareMultipleGoods(uid);
+		}
+	}
+
+	/**
+	 * 鍒嗕韩閾炬帴
+	 * 
+	 * @param shareRecord
+	 * @return
+	 */
+	public String getShareUrl(UserShareGoodsRecord shareRecord) {
+		Long uid = shareRecord.getUid();
+		Long shareId = shareRecord.getId();
+		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), shareId + "", source + "");
+
+		String shortLink = HttpUtil.getShortLink(url);
+		if (!StringUtil.isNullOrEmpty(shortLink)) {
+			url = shortLink;
+		}
+		return url;
+	}
+
+	/**
+	 * 鍒嗕韩閾炬帴
+	 * 
+	 * @param shareRecord
+	 * @return
+	 */
+	public String getShareUrlV2(UserShareGoodsRecord shareRecord) {
+		Long uid = shareRecord.getUid();
+		Long shareId = shareRecord.getId();
+
+		String url = String.format("http://%s/share_mushGoods_1.6.0.html?uid=%s&shareId=%s", configService.getH5Host(),
+				AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareId + "");
+
+		String shortLink = HttpUtil.getShortLink(url);
+		if (!StringUtil.isNullOrEmpty(shortLink)) {
+			url = shortLink;
+		}
+		return url;
+	}
+
+	/**
+	 * 鐢熸垚鍒嗕韩鍥�
+	 * 
+	 * @param uid
+	 *            鐢ㄦ埛id
+	 * @param shareId
+	 *            鍒嗕韩璁板綍id
+	 * @param source
+	 *            鏉ユ簮
+	 * @param listGoods
+	 * @return
+	 * @throws UserShareGoodsRecordException
+	 */
+	public FileUploadResult drawingSharePicture(Long uid, Long shareId, String url, List<CommonGoods> listGoods)
+			throws UserShareGoodsRecordException {
+
+		InputStream erCodeInputStream = null;
+		// 鐢熸垚閾炬帴浜岀淮鐮�
+		try {
+			erCodeInputStream = QRCodeUtil.getInstance(500).encode(url);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		// 鑾峰彇鍒扮敤鎴风殑澶村儚
+		UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);
+		if (user == null) {
+			throw new UserShareGoodsRecordException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+		}
+
+		InputStream portrait = null;
+		if (!StringUtil.isNullOrEmpty(user.getPortrait())) {
+			try {
+				portrait = HttpUtil.downLoadImg(user.getPortrait());
+			} catch (HttpException e) {
+				String portraitUrl = userAccountService.repairPortrait(uid);
+				if (StringUtil.isNullOrEmpty(portraitUrl))
+					throw new UserShareGoodsRecordException(1, "鑾峰彇澶村儚鍑洪敊");
+				else {
+					// 鍐嶆鑾峰彇澶村儚
+					try {
+						portrait = HttpUtil.downLoadImg(portraitUrl);
+					} catch (HttpException e1) {
+						throw new UserShareGoodsRecordException(1, "鑾峰彇澶村儚鍑洪敊");
+					}
+				}
+			}
+		}
+
+		InputStream inputStream = ImageUtil.drawGoodsSharePicture(erCodeInputStream, portrait, listGoods);
+		FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,
+				FilePathEnum.shareGoods.getPath() + "share_" + uid + "_" + shareId + "_" + System.currentTimeMillis()
+						+ ".png");
+
+		return shareImg;
+	}
+
+	@Override
+	public void saveShareRecord(Long uid, CommonGoods goods) throws UserShareGoodsRecordException {
+		if (goods == null || uid == null) {
+			throw new UserShareGoodsRecordException(1, "鍙傛暟缂哄け");
+		}
+
+		UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord();
+		userShareGoodsRecord.setShareState(1);
+		userShareGoodsRecord.setUid(uid);
+		userShareGoodsRecord.setSource(ShareSourceTypeEnum.goodsDetail);
+		CommonGoods resultCommonGoods = null;
+		try {
+			resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(goods);
+		} catch (CommonGoodsException e) {
+			throw new UserShareGoodsRecordException(1, "鍟嗗搧瀛樺叆澶辫触");
+		}
+
+		UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(), uid);
+		if (singleGoods != null) {
+			// 鍗曚釜鍟嗗搧澶氭鍒嗕韩
+			userShareGoodsRecord.setPicture(resultCommonGoods.getPicture());
+			userShareGoodsRecord.setId(singleGoods.getRecordId());
+			userShareGoodsRecord.setUpdateTime(new Date());
+			userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);
+
+			// 鏈�鏂板晢鍝�
+			singleGoods.setUpdateTime(new Date());
+			userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);
+		} else {
+			// 鍗曚釜鍟嗗搧绗竴娆″垎浜�
+			Date date = new Date();
+			userShareGoodsRecord.setPicture(resultCommonGoods.getPicture());
+			userShareGoodsRecord.setCreateTime(date);
+			userShareGoodsRecord.setUpdateTime(date);
+			userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
+
+			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());
+			userShareGoodsGroupService.insertSelective(singleGoods);
+		}
+	}
+
 }

--
Gitblit v1.8.0