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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java

@@ -27,14 +27,14 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.lable.QualityFactoryService;

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

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

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -66,7 +66,7 @@
   private TaoBaoClassService taoBaoClassService;

   

   @Resource

   private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;

   private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;



   /**

    * 

@@ -981,11 +981,11 @@
         PrintWriter out) {

      try {

         key = StringUtil.isNullOrEmpty(key) ? "" : key;

         List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listSearchByTitleWithCid(key, cid, pageIndex,

         List<DaTaoKeDetailV2> list = daTaoKeGoodsDetailV2Service.listSearchByTitleWithCid(key, cid, pageIndex,

               pageSize);

         long count = daTaoKeGoodsDetailService.countSearchByTitleWithCid(key, cid);

         long count = daTaoKeGoodsDetailV2Service.countSearchByTitleWithCid(key, cid);

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

         for (DaTaoKeDetail detail : list) {

         for (DaTaoKeDetailV2 detail : list) {

            goodsList.add(TaoBaoUtil.convert(detail));

         }