双12活动添加,邀请码发布修改，爬单新规则添加

admin

2019-12-06 cd637932a970e7935b17d41568fe89c92775bccc

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

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

@@ -43,7 +44,7 @@
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;

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

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

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

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

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



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

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

@@ -272,6 +273,9 @@
      if (StringUtil.isNullOrEmpty(shopLink)) {

         taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));

      }

		
      if(StringUtil.isNullOrEmpty(taoBaoShop.getShopIcon())) 
         taoBaoShop.setShopIcon(dynamicShopInfo.getShopIcon());



      DynamicInfo dynamicVO = new DynamicInfo();

      dynamicVO.setId(brandId);

@@ -963,6 +967,8 @@


         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

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



         for (DynamicInfo dynamicInfo : list) {

            DynamicInfo dynamicNew = new DynamicInfo();

            try {

@@ -1017,8 +1023,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);

@@ -1104,10 +1109,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 {