yujian
2019-12-18 89cc8f054c27f70fcfe16f14554a8a12e0c19e23
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;
@@ -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 {