admin
2021-05-29 e75b0d79535a6bcd147cca4a54632b70b42afdb9
fanli/src/main/java/com/yeshi/fanli/service/impl/lable/TaoKeGoodsServiceImpl.java
@@ -10,6 +10,7 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
import org.yeshi.utils.JsonUtil;
@@ -53,6 +54,9 @@
   @Resource
   private QualityGoodsService qualityGoodsService;
    @Resource
    private GoodsLijinMnager goodsLijinMnager;
   @Cacheable(value = "taoKeMaterialCache", key = "'listByMaterial-'+#materialId +'-'+#pageIndex")
   @Override
@@ -303,6 +307,7 @@
       GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(platform, version,system);
        List<TaoBaoGoodsBrief> goodsBriefList = new ArrayList<>();
      if (fq == 0 && fh == 0 && !ft) {
         if (result != null && result.getTaoBaoGoodsBriefs() != null)
            for (TaoBaoGoodsBrief bf : result.getTaoBaoGoodsBriefs()) {
@@ -316,8 +321,7 @@
                  }
               }
               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(bf, paramsDTO);
               re.add(goodsDetailVO);
                    goodsBriefList.add(bf);
            }
      } else {
         if (taoBaoGoodsBriefs != null)
@@ -331,20 +335,23 @@
                     break;
                  }
               }
               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);
               re.add(goodsDetailVO);
                    goodsBriefList.add(taoBaoGoodsBrief);
            }
      }
      Gson gson2 = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
            .excludeFieldsWithoutExposeAnnotation().create();
        List<GoodsDetailVO> voList = goodsLijinMnager.loadTBMoneyInfo(system, null, goodsBriefList, paramsDTO);
        for (GoodsDetailVO vo : voList) {
            re.add(vo);
        }
      data.put("result", gson2.toJson(re));
      data.put("count", result.getTaoBaoHead().getDocsfound());
      return data;
   }
   
   @Override