Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

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

@@ -42,15 +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.integral.IntegralGetService;

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;

@@ -92,11 +95,9 @@


   @Resource

   private UserGoodsStorageService userGoodsStorageService;

	


   @Resource

   private IntegralGetService integralGetService;

	
	


   @Override

   public int insert(UserShareGoodsRecord record) {

@@ -127,10 +128,10 @@
   public long countQueryByUid(Long uid, String source) {

      return userShareGoodsRecordMapper.countQueryByUid(uid, source);

   }

	


   @Override

   public List<UserShareGoodsGroup> listByRecordId(Long shareId) {

      return  userShareGoodsGroupService.listByRecordId(shareId);

      return userShareGoodsGroupService.listByRecordId(shareId);

   }



   @Override

@@ -211,12 +212,12 @@
                     }

                  }

               }

					


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

@@ -228,7 +229,7 @@
               if (StringUtil.isNullOrEmpty(shareType)) {

                  shareRecord.setShareType(UserShareGoodsRecord.SHARETYPE_SINGLE);

               }

					


               BigDecimal totalMoney = shareRecord.getTotalMoney();

               if (totalMoney == null) {

                  shareRecord.setTotalMoney(new BigDecimal(0));

@@ -241,8 +242,7 @@
   }



   @Override

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

         throws UserShareGoodsRecordException {

   public void saveSingleShareRecord(Long uid, Long goodsId, Integer goodsType) throws UserShareGoodsRecordException {

      if (goodsId == null) {

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

      }

@@ -332,7 +332,7 @@
    * @param userShareGoodsRecord

    * @param listGoods

    */

   @Transactional

   @Transactional(rollbackFor = Exception.class)

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

         throws UserShareGoodsRecordException {

      // 分享记录

@@ -375,7 +375,7 @@
    * @param userShareGoodsRecord

    * @param listGoods

    */

   @Transactional

   @Transactional(rollbackFor = Exception.class)

   public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord,

         List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException {



@@ -426,9 +426,12 @@
   /**

    * 生成分享图

    * 

    * @param uid       用户id

    * @param shareId   分享记录id

    * @param source    来源

    * @param uid

    *            用户id

    * @param shareId

    *            分享记录id

    * @param source

    *            来源

    * @param listGoods

    * @return

    * @throws UserShareGoodsRecordException

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

   }

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

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

@@ -661,7 +667,8 @@
   }



   @Override

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

      }

@@ -674,7 +681,8 @@
      recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);



      // 分享id

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

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



@@ -682,8 +690,8 @@
   }



   @Override

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

         throws UserShareGoodsRecordException {

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

      }

@@ -697,11 +705,10 @@
      userShareGoodsRecordMapper.insertSelective(record);



      List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();

      for (TaoBaoGoodsBrief goodsBrief: listGoodsBrief) {

      for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {

         listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));

      }

		
		


      Long id = record.getId();

      // 分享链接

      String shareUrl = getShareUrl(record);

@@ -718,17 +725,17 @@
      recordDTO.setSource(ShareSourceTypeEnum.storage);



      // 缓存分享商品信息

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

      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)

         throws UserShareGoodsRecordException {

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

      }

@@ -745,7 +752,6 @@
      // 分享链接

      String shareUrl = getShareUrlV2(record);

      // 分享二维码链接

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



      ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO();

      recordDTO.setUid(uid);

@@ -753,11 +759,14 @@
      recordDTO.setShareUrl(shareUrl);

      recordDTO.setListId(listStorageID);

      recordDTO.setListGoods(listGoods);

      recordDTO.setSharePictureUrl(uploadResult.getUrl());

      if (needDrawPicture) {

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

         recordDTO.setSharePictureUrl(uploadResult.getUrl());

      }

      recordDTO.setSource(ShareSourceTypeEnum.storage);



      // 缓存分享商品信息

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

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#GoodsStorage#" + id));

      recordDTO.setRedisKey(key);



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

@@ -783,10 +792,10 @@
      userShareGoodsRecordMapper.insertSelective(record);



      List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();

      for (TaoBaoGoodsBrief goodsBrief: listGoodsBrief) {

      for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {

         listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));

      }

		


      Long id = record.getId();

      // 分享链接

      String shareUrl = getShareUrl(record);

@@ -801,7 +810,7 @@
      recordDTO.setSharePictureUrl(uploadResult.getUrl());

      recordDTO.setSource(ShareSourceTypeEnum.activity);

      // 缓存分享商品信息

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

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#Activity#" + id));

      recordDTO.setRedisKey(key);



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

@@ -826,10 +835,10 @@
      userShareGoodsRecordMapper.insertSelective(record);



      List<CommonGoods> listCommonGoods = new ArrayList<CommonGoods>();

      for (TaoBaoGoodsBrief goodsBrief: listGoodsBrief) {

      for (TaoBaoGoodsBrief goodsBrief : listGoodsBrief) {

         listCommonGoods.add(CommonGoodsFactory.create(goodsBrief));

      }

		


      Long id = record.getId();

      // 分享链接

      String shareUrl = getShareUrl(record);

@@ -842,7 +851,7 @@
      recordDTO.setSource(ShareSourceTypeEnum.activity);



      // 缓存分享商品信息

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

      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, StringUtil.Md5(uid + "#Dynamic#" + id));

      recordDTO.setRedisKey(key);



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

@@ -856,7 +865,8 @@
         throw new UserShareGoodsRecordException(1, "传递参数不正确");

      }

      ShareGoodsRecordDTO recordDTO = null;

      String value = redisManager.getCommonString(shareKey);

      String redisKey = RedisKeyEnum.getRedisKey(RedisKeyEnum.emptyKey, shareKey);

      String value = redisManager.getCommonString(redisKey);

      if (!StringUtil.isNullOrEmpty(value)) {

         recordDTO = JsonUtil.getSimpleGson().fromJson(value, ShareGoodsRecordDTO.class);

      }

@@ -872,7 +882,7 @@
      ShareSourceTypeEnum source = recordDTO.getSource();

      if (ShareSourceTypeEnum.goodsDetail.equals(source)) {

         // 商品详情分享

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

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

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

         // 动态分享

         UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();

@@ -882,16 +892,16 @@
         updateByPrimaryKeySelective(shareRecord);



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

         if (listGoods != null && listGoods.size() > 1) 
         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);

@@ -900,7 +910,7 @@


         // 保存商品信息

         multipleGoodsShareRecord(shareId, recordDTO.getListGoods());

			


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

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

         if (listId != null && listId.size() > 0) {

@@ -912,10 +922,10 @@
            }

         }

      }

		


      // 清理缓存

      redisManager.removeCommonString(shareKey);

		
      redisManager.removeCommonString(redisKey);



      if (singleGoods) {

         if (taolijin) {

            integralGetService.addShareTLJGoods(uid);

@@ -947,8 +957,7 @@
      }

      return url;

   }

	
	


   /**

    * 分享链接

    * 

@@ -959,8 +968,8 @@
      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 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)) {

@@ -972,9 +981,12 @@
   /**

    * 生成分享图

    * 

    * @param uid       用户id

    * @param shareId   分享记录id

    * @param source    来源

    * @param uid

    *            用户id

    * @param shareId

    *            分享记录id

    * @param source

    *            来源

    * @param listGoods

    * @return

    * @throws UserShareGoodsRecordException

@@ -1017,9 +1029,59 @@


      InputStream inputStream = ImageUtil.drawGoodsSharePicture(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;

   }



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

      }

   }



}