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

@@ -26,6 +26,7 @@
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;

@@ -42,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;

@@ -90,6 +92,11 @@


   @Resource

   private UserGoodsStorageService userGoodsStorageService;

	
   @Resource

   private IntegralGetService integralGetService;

	
	


   @Override

   public int insert(UserShareGoodsRecord record) {

@@ -326,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);



@@ -656,7 +661,7 @@
   }



   @Override

   public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType) 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, "传递参数不正确");

      }

@@ -665,6 +670,7 @@
      recordDTO.setUid(uid);

      recordDTO.setAuctionId(auctionId);

      recordDTO.setGoodsType(goodsType);

      recordDTO.setTaolijin(isTaolijin);

      recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);



      // 分享id

@@ -690,18 +696,24 @@
      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);



@@ -715,9 +727,9 @@
   }

   

   @Override

   public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID)

   public ShareGoodsRecordDTO addRecordGoodsStorageV2(Long uid, List<CommonGoods> listGoods, List<Long> listStorageID)

         throws UserShareGoodsRecordException {

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

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

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

      }

      // 插入记录

@@ -725,7 +737,7 @@
      record.setUid(uid);

      record.setShareState(0); // 初始未分享

      record.setSource(ShareSourceTypeEnum.storage);

      record.setPicture(listGoodsBrief.get(0).getPictUrl()); // 取一个商品图片作为主图

      record.setPicture(listGoods.get(0).getPicture()); // 取一个商品图片作为主图

      record.setCreateTime(new Date());

      userShareGoodsRecordMapper.insertSelective(record);



@@ -733,14 +745,14 @@
      // 分享链接

      String shareUrl = getShareUrlV2(record);

      // 分享二维码链接

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

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



      ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();

      recordDTO.setUid(uid);

      recordDTO.setShareId(id);

      recordDTO.setShareUrl(shareUrl);

      recordDTO.setListId(listStorageID);

      recordDTO.setListGoodsBrief(listGoodsBrief);

      recordDTO.setListGoods(listGoods);

      recordDTO.setSharePictureUrl(uploadResult.getUrl());

      recordDTO.setSource(ShareSourceTypeEnum.storage);



@@ -770,16 +782,21 @@
      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);

@@ -808,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);

@@ -816,7 +838,7 @@
      recordDTO.setUid(uid);

      recordDTO.setShareId(id);

      recordDTO.setShareUrl(shareUrl);

      recordDTO.setListGoodsBrief(listGoodsBrief);

      recordDTO.setListGoods(listCommonGoods);

      recordDTO.setSource(ShareSourceTypeEnum.activity);



      // 缓存分享商品信息

@@ -829,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, "传递参数不正确");

      }

@@ -843,6 +865,9 @@
         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)) {

@@ -856,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);

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



         // 保存商品信息

         multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief());

         multipleGoodsShareRecord(shareId, recordDTO.getListGoods());

         

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

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

@@ -884,6 +915,16 @@
      

      // 清理缓存

      redisManager.removeCommonString(shareKey);

		
      if (singleGoods) {

         if (taolijin) {

            integralGetService.addShareTLJGoods(uid);

         } else {

            integralGetService.addShareSingleGoods(uid);

         }

      } else {

         integralGetService.addShareMultipleGoods(uid);

      }

   }



   /**

@@ -938,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;