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

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

 fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java

@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.impl.dynamic;



import java.io.InputStream;

import java.lang.reflect.InvocationTargetException;

import java.math.BigDecimal;

import java.text.SimpleDateFormat;

@@ -18,9 +19,11 @@
import org.springframework.stereotype.Service;

import org.yeshi.utils.DateLunarUtil;

import org.yeshi.utils.DateUtil;

import org.yeshi.utils.HttpUtil;

import org.yeshi.utils.taobao.TbImgUtil;



import com.yeshi.fanli.dao.dynamic.DynamicInfoDao;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.taobao.TaoBaoShopDTO;

import com.yeshi.fanli.entity.bus.activity.ActivityRuleUser;

import com.yeshi.fanli.entity.bus.activity.ActivityUser;

@@ -35,7 +38,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;

import com.yeshi.fanli.entity.taobao.TaoBaoShop;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;

import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.activity.ActivityUserService;

@@ -43,10 +46,10 @@
import com.yeshi.fanli.service.inter.dynamic.DynamicInfoService;

import com.yeshi.fanli.service.inter.dynamic.InviteMaterialService;

import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsService;

import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -75,7 +78,7 @@
   private RedisManager redisManager;



   @Resource

   private DaTaoKeGoodsService daTaoKeGoodsService;

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   @Resource

   private JumpDetailV2Service jumpDetailV2Service;

@@ -148,7 +151,7 @@
         buffer.append("         ");

         buffer.append("早安～\n");

         buffer.append("我的邀请码：【邀请码】\n");

         buffer.append("购物省钱返利券App：【邀请链接】");

         buffer.append("购物省钱板栗快省App：【邀请链接】");



         content = content.replaceAll("\\,", "\\，").replaceAll("\\.", "\\。").replaceAll("\\;", "\\；")

               .replaceAll("\\!", "\\！").replaceAll("\\?", "\\？").replaceAll("\\:", "\\：");

@@ -344,9 +347,9 @@
            count = 4;

         }



         List<DaTaoKeDetail> listDaTaoKe = daTaoKeGoodsService.getGoodsNotInList(subclassId, null, count);

         List<DaTaoKeDetailV2> listDaTaoKe = daTaoKeGoodsDetailV2Service.getGoodsNotInList(subclassId, null, count);



         DaTaoKeDetail daTaoKeDetail = null;

         DaTaoKeDetailV2 daTaoKeDetail = null;

         // 商品列表

         List<GoodsPicture> listPicture = new ArrayList<GoodsPicture>();

         // 商品列表

@@ -355,7 +358,7 @@
         BigDecimal shareMoney = new BigDecimal(0);



         BigDecimal proportion = hongBaoManageService.getFanLiRate();

         for (DaTaoKeDetail daTaoKe : listDaTaoKe) {

         for (DaTaoKeDetailV2 daTaoKe : listDaTaoKe) {

            if (daTaoKeDetail == null) {

               daTaoKeDetail = daTaoKe;

            }

@@ -475,7 +478,7 @@
         }

      }

      // 大淘客数据

      DaTaoKeDetail daTaoKe = daTaoKeGoodsService.getGoodsNotInList(subclassId, listId, 1).get(0);

      DaTaoKeDetailV2 daTaoKe = daTaoKeGoodsDetailV2Service.getGoodsNotInList(subclassId, listId, 1).get(0);

      if (daTaoKe == null) {

         return addSuccess;

      }

@@ -512,7 +515,7 @@
      TaoBaoGoodsBrief taoBaoGoodsBrief2 = TaoKeApiUtil.getSimpleGoodsInfo(daTaoKe.getGoodsId());

      List<String> imgList = taoBaoGoodsBrief2.getImgList();

      List<String> listimgs = new ArrayList<String>();

      String pic = daTaoKe.getPic();

      String pic = daTaoKe.getMainPic();

      listimgs.add(TbImgUtil.getTBSize320Img(pic));

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

         for (String img : imgList) {

@@ -575,7 +578,7 @@
    * @param subclassId

    * @throws TaobaoGoodsDownException

    */

   public DynamicInfo getDynamicInfo(DaTaoKeDetail daTaoKe, Long classId, Long subclassId) {

   public DynamicInfo getDynamicInfo(DaTaoKeDetailV2 daTaoKe, Long classId, Long subclassId) {

      DynamicInfo dynamicInfo = new DynamicInfo();

      dynamicInfo.setId(UUID.randomUUID().toString().replace("-", ""));

      dynamicInfo.setClassId(classId);

@@ -610,11 +613,11 @@
    * @param daTaoKe

    * @return

    */

   public GoodsPicture getGoodsPicture(DaTaoKeDetail daTaoKe) {

   public GoodsPicture getGoodsPicture(DaTaoKeDetailV2 daTaoKe) {

      GoodsPicture goodsPicture = new GoodsPicture();

      goodsPicture.setH(100);

      goodsPicture.setW(100);

      goodsPicture.setUrl(TbImgUtil.getTBSize320Img(daTaoKe.getPic()));

      goodsPicture.setUrl(TbImgUtil.getTBSize320Img(daTaoKe.getMainPic()));

      goodsPicture.setJumpDetail(jumpDetailV2Service.getByTypeCache("goodsdetail"));



      String goodsId = daTaoKe.getGoodsId().toString();

@@ -714,8 +717,14 @@
            size = inviteInfo.getSize();

         }



         InputStream asInputStream = HttpUtil.getAsInputStream(picUrl);

			
         int index = picUrl.lastIndexOf("/");

         String newUrl = picUrl.substring(index + 1);

         String urlMd5 = newUrl.substring(0, newUrl.lastIndexOf("."));

			
         // 图片

         String imgLink = qrCodeService.drawInviteQrCodeNew(picUrl, null, null, pX, pY, size, null);

         String imgLink = qrCodeService.drawInviteQrCodeNew(asInputStream, urlMd5, null, null, pX, pY, size, null);

         GoodsPicture p2 = new GoodsPicture();

         p2.setW(100);

         p2.setH(100);

@@ -966,6 +975,8 @@


         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

          ConfigParamsDTO paramsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,hongBaoManageService.getVIPFanLiRate());



         for (DynamicInfo dynamicInfo : list) {

            DynamicInfo dynamicNew = new DynamicInfo();

            try {

@@ -1020,8 +1031,7 @@
                  goods.setCouponStartFee(goodsMap.get(goods.getAuctionId()).getCouponStartFee());

                  goods.setTkRate(goodsMap.get(goods.getAuctionId()).getTkRate());



                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate,

                        shareRate);

                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, paramsDTO);



                  goodsNew.setGoodsVO(detailVO);

                  goodsNew.setGoods(null);

@@ -1107,10 +1117,10 @@
                  continue;

               }



               Integer state = oldExtra.getState();

               if (state != null && state == 1) {

                  continue;

               }

               /*

                * Integer state = oldExtra.getState(); if (state != null && state == 1) {

                * continue; }

                */



               TaoBaoGoodsBrief goodsBrief = null;

               try {