金币BUG修改

admin

2019-09-22 b9f8ef2c4737b6e6be4b12fc8f7bafb033bfcfe5

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

@@ -1,10 +1,13 @@
package com.yeshi.fanli.service.impl.dynamic;



import java.lang.reflect.InvocationTargetException;

import java.math.BigDecimal;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.UUID;



import javax.annotation.Resource;

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

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

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

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

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

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



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

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

@@ -269,6 +272,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);

@@ -916,6 +922,37 @@
      return list;

   }



   private Map<Long, TaoBaoGoodsBrief> getFilterGoodsMap(List<DynamicInfo> list) {

      // 提取过滤商品

      List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();

      for (DynamicInfo dynamicInfo : list) {

         List<GoodsPicture> gpList = dynamicInfo.getImgs();

         if (gpList != null)

            for (GoodsPicture gp : gpList) {

               if (gp != null && gp.getGoods() != null) {

                  TaoBaoGoodsBriefExtra newGoods = new TaoBaoGoodsBriefExtra();

                  try {

                     PropertyUtils.copyProperties(newGoods, gp.getGoods());

                     goodsList.add(newGoods);

                  } catch (IllegalAccessException e) {

                     e.printStackTrace();

                  } catch (InvocationTargetException e) {

                     e.printStackTrace();

                  } catch (NoSuchMethodException e) {

                     e.printStackTrace();

                  }



               }

            }

      }

      goodsList = taoBaoGoodsUpdateService.filterImportantTaoBaoGoods(goodsList);

      Map<Long, TaoBaoGoodsBrief> map = new HashMap<>();

      if (goodsList != null)

         for (TaoBaoGoodsBrief goods : goodsList)

            map.put(goods.getAuctionId(), goods);

      return map;

   }



   @Override

   @Cacheable(value = "dynamicCache", key = "'queryV2-'+#platform+'-'+#version+'-'+#start+'-'+#count+'-'+#cid+'-'+#subId")

   public List<DynamicInfo> queryV2(int platform, int version, int start, int count, Long cid, Long subId) {

@@ -924,6 +961,9 @@
      // 需要更新的商品

      List<TaoBaoGoodsBrief> taoBaoGoodsUpdateList = new ArrayList<>();

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

         // 提取商品

         Map<Long, TaoBaoGoodsBrief> goodsMap = getFilterGoodsMap(list);



         BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

         BigDecimal shareRate = hongBaoManageService.getShareRate();

         for (DynamicInfo dynamicInfo : list) {

@@ -974,8 +1014,15 @@
                     continue;

                  }



                  // 过滤券信息与资金信息

                  goods.setCouponAmount(goodsMap.get(goods.getAuctionId()).getCouponAmount());

                  goods.setZkPrice(goodsMap.get(goods.getAuctionId()).getZkPrice());

                  goods.setCouponStartFee(goodsMap.get(goods.getAuctionId()).getCouponStartFee());

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



                  GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBaoGoodsBriefExtra(goods, fanLiRate,

                        shareRate);



                  goodsNew.setGoodsVO(detailVO);

                  goodsNew.setGoods(null);