Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java

@@ -24,13 +24,16 @@
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.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.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,6 +43,7 @@
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.integral.IntegralGetService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;

@@ -88,6 +92,11 @@


   @Resource

   private UserGoodsStorageService userGoodsStorageService;

	
   @Resource

   private IntegralGetService integralGetService;

	
	


   @Override

   public int insert(UserShareGoodsRecord record) {

@@ -117,6 +126,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

@@ -197,6 +211,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));

               }

            }

         }

      }

@@ -205,8 +241,9 @@
   }



   @Override

   public void saveSingleShareRecord(Long uid, Long auctionId) throws UserShareGoodsRecordException {

      if (auctionId == null) {

   public void saveSingleShareRecord(Long uid, Long goodsId, Integer goodsType)

         throws UserShareGoodsRecordException {

      if (goodsId == null) {

         throw new UserShareGoodsRecordException(1, "分享商品不能为空");

      }



@@ -214,11 +251,31 @@
         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();

@@ -226,50 +283,46 @@
      userShareGoodsRecord.setSource(ShareSourceTypeEnum.goodsDetail);

      userShareGoodsRecord.setShareState(1);



      convertGoods.setState(0);

      CommonGoods resultCommonGoods = null;

      try {

         CommonGoods convertGoods = CommonGoodsFactory.create(goodsBrief);

         convertGoods.setState(goodsBrief.getState());

         CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(convertGoods);



         if (resultCommonGoods == null) {

            return;

         }



         UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),

               userShareGoodsRecord.getUid());



         if (singleGoods != null) {

            // 单个商品多次分享

            userShareGoodsRecord.setPicture(goodsBrief.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(goodsBrief.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);

      }

   }



@@ -280,16 +333,14 @@
    * @param listGoods

    */

   @Transactional

   public void multipleGoodsShareRecord(Long shareId, List<TaoBaoGoodsBrief> listGoods)

   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);



@@ -610,7 +661,7 @@
   }



   @Override

   public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId) throws UserShareGoodsRecordException {

   public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType, boolean isTaolijin) throws UserShareGoodsRecordException {

      if (auctionId == null || uid == null || uid <= 0) {

         throw new UserShareGoodsRecordException(1, "传递参数不正确");

      }

@@ -618,10 +669,12 @@
      ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();

      recordDTO.setUid(uid);

      recordDTO.setAuctionId(auctionId);

      recordDTO.setGoodsType(goodsType);

      recordDTO.setTaolijin(isTaolijin);

      recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);



      // 分享id

      String key = StringUtil.Md5(uid + "#" + auctionId);

      String key = StringUtil.Md5(uid + "#GoodsDetail#" + auctionId + "#Type#"+ goodsType);

      redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);

      recordDTO.setRedisKey(key);



@@ -643,23 +696,68 @@
      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, listGoodsBrief);

      FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listCommonGoods);



      ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();

      recordDTO.setUid(uid);

      recordDTO.setShareId(id);

      recordDTO.setShareUrl(shareUrl);

      recordDTO.setListId(listStorageID);

      recordDTO.setListGoodsBrief(listGoodsBrief);

      recordDTO.setListGoods(listCommonGoods);

      recordDTO.setSharePictureUrl(uploadResult.getUrl());

      recordDTO.setSource(ShareSourceTypeEnum.storage);



      // 缓存分享商品信息

      String key = StringUtil.Md5(uid + "##" + id);

      String key = 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)

         throws UserShareGoodsRecordException {

      if (uid == null || uid <= 0 || listGoods == null || listGoods.size() == 0) {

         throw new UserShareGoodsRecordException(1, "传递参数不正确");

      }

      // 插入记录

      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);

      // 分享二维码链接

      FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listGoods);



      ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();

      recordDTO.setUid(uid);

      recordDTO.setShareId(id);

      recordDTO.setShareUrl(shareUrl);

      recordDTO.setListId(listStorageID);

      recordDTO.setListGoods(listGoods);

      recordDTO.setSharePictureUrl(uploadResult.getUrl());

      recordDTO.setSource(ShareSourceTypeEnum.storage);



      // 缓存分享商品信息

      String key = StringUtil.Md5(uid + "#GoodsStorage#" + id);

      recordDTO.setRedisKey(key);



      redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);

@@ -684,21 +782,26 @@
      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, listGoodsBrief);

      FileUploadResult uploadResult = drawingSharePicture(uid, id, shareUrl, listCommonGoods);



      ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();

      recordDTO.setUid(uid);

      recordDTO.setShareId(id);

      recordDTO.setListGoodsBrief(listGoodsBrief);

      recordDTO.setListGoods(listCommonGoods);

      recordDTO.setShareUrl(shareUrl);

      recordDTO.setSharePictureUrl(uploadResult.getUrl());

      recordDTO.setSource(ShareSourceTypeEnum.activity);

      // 缓存分享商品信息

      String key = StringUtil.Md5(uid + "##" + id);

      String key = StringUtil.Md5(uid + "#Activity#" + id);

      recordDTO.setRedisKey(key);



      redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);

@@ -722,6 +825,11 @@
      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);

@@ -730,11 +838,11 @@
      recordDTO.setUid(uid);

      recordDTO.setShareId(id);

      recordDTO.setShareUrl(shareUrl);

      recordDTO.setListGoodsBrief(listGoodsBrief);

      recordDTO.setListGoods(listCommonGoods);

      recordDTO.setSource(ShareSourceTypeEnum.activity);



      // 缓存分享商品信息

      String key = StringUtil.Md5(uid + "##" + id);

      String key = StringUtil.Md5(uid + "#Dynamic#" + id);

      recordDTO.setRedisKey(key);



      redisManager.cacheCommonString(key, JsonUtil.getSimpleGson().toJson(recordDTO), 60 * 20);

@@ -743,7 +851,7 @@
   }



   @Override

   public void takeEffectShareRecord(String shareKey) throws UserShareGoodsRecordException {

   public void takeEffectShareRecord(AcceptData acceptData, String shareKey) throws UserShareGoodsRecordException {

      if (StringUtil.isNullOrEmpty(shareKey)) {

         throw new UserShareGoodsRecordException(1, "传递参数不正确");

      }

@@ -757,11 +865,14 @@
         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());

         saveSingleShareRecord(recordDTO.getUid(), recordDTO.getAuctionId(),recordDTO.getGoodsType());

      } else if (ShareSourceTypeEnum.activity.equals(source)) {

         // 动态分享

         UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();

@@ -770,11 +881,17 @@
         shareRecord.setUpdateTime(new Date());

         updateByPrimaryKeySelective(shareRecord);



         List<CommonGoods> listGoods = recordDTO.getListGoods();

         if (listGoods != null && listGoods.size() > 1) 
            singleGoods = false;

			
         // 保存商品信息

         multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief());

         multipleGoodsShareRecord(shareId, recordDTO.getListGoods());



      } else if (ShareSourceTypeEnum.storage.equals(source)) {

         // 分享库分享

         singleGoods = false;

			
         UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();

         shareRecord.setId(shareId);

         shareRecord.setShareState(1);

@@ -782,7 +899,7 @@
         updateByPrimaryKeySelective(shareRecord);



         // 保存商品信息

         multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief());

         multipleGoodsShareRecord(shareId, recordDTO.getListGoods());

         

         // 更新选品库商品状态 为已分享

         List<Long> listId = recordDTO.getListId();

@@ -798,6 +915,16 @@
      

      // 清理缓存

      redisManager.removeCommonString(shareKey);

		
      if (singleGoods) {

         if (taolijin) {

            integralGetService.addShareTLJGoods(uid);

         } else {

            integralGetService.addShareSingleGoods(uid);

         }

      } else {

         integralGetService.addShareMultipleGoods(uid);

      }

   }



   /**

@@ -820,6 +947,27 @@
      }

      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;

   }



   /**

    * 生成分享图

@@ -831,7 +979,7 @@
    * @return

    * @throws UserShareGoodsRecordException

    */

   public FileUploadResult drawingSharePicture(Long uid, Long shareId, String url, List<TaoBaoGoodsBrief> listGoods)

   public FileUploadResult drawingSharePicture(Long uid, Long shareId, String url, List<CommonGoods> listGoods)

         throws UserShareGoodsRecordException {



      InputStream erCodeInputStream = null;

@@ -867,7 +1015,7 @@
         }

      }



      InputStream inputStream = ImageUtil.drawGoodsShareBigImg(erCodeInputStream, portrait, listGoods);

      InputStream inputStream = ImageUtil.drawGoodsSharePicture(erCodeInputStream, portrait, listGoods);

      FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream,

            "sharegoods/share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png");