Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-31 617312cbc114c6ac38c8eb4a8bcda583c33dd72f

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/JingDongControllerV2.java

@@ -13,15 +13,10 @@


import com.google.gson.Gson;

import com.google.gson.GsonBuilder;

import com.yeshi.fanli.dto.jd.JDFilter;

import com.yeshi.fanli.dto.jd.JDSearchFilter;

import com.yeshi.fanli.dto.jd.JDSearchResult;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.homemodule.Special;

import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;

import com.yeshi.fanli.entity.bus.lable.QualityFactory;

import com.yeshi.fanli.entity.jd.JDGoods;

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

import com.yeshi.fanli.exception.jd.JDGoodsException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.config.ConfigService;

@@ -32,10 +27,7 @@
import com.yeshi.fanli.service.inter.jd.JDGoodsService;

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

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

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

import com.yeshi.fanli.util.taobao.SearchFilterUtil;

import com.yeshi.fanli.vo.goods.GoodsDetailVO;



import net.sf.json.JSONArray;

@@ -94,7 +86,7 @@
   

   

   /**

    * 京东专题

    * 京东专题 + 商品列表

    * @param acceptData

    * @param out

    */

@@ -115,31 +107,25 @@
         root.put("listSpe", JsonUtil.getApiCommonGson().toJson(listSpecial));

      }

      

		
      try {

         JDSearchResult result = jdGoodsService.specialSearch(page, cid);

         List<JDGoods> goodsList = jdGoodsService.specialSearch(page, cid);

         JSONArray array = new JSONArray();

         JSONObject data = new JSONObject();

         if (result != null) {

            List<JDGoods> goodsList = result.getGoodsList();

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

               BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

               BigDecimal shareRate = hongBaoManageService.getShareRate();

               Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                     .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

               for (JDGoods goods : goodsList) {

                  GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate,

                        shareRate);

                  array.add(gson.toJson(goodsDetailVO));

               }

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

            BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();

            BigDecimal shareRate = hongBaoManageService.getShareRate();

            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

                  .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();

            for (JDGoods goods : goodsList) {

               GoodsDetailVO goodsDetailVO = GoodsDetailVOFactory.convertJDGoods(goods, fanLiRate,   shareRate);

               array.add(gson.toJson(goodsDetailVO));

            }

         }

         

         data.put("list", array);

         data.put("count", 1000);

         out.print(JsonUtil.loadTrueResult(data));

         root.put("list", array);

         root.put("count", 1000);

         out.print(JsonUtil.loadTrueResult(root));

      } catch (JDGoodsException e) {

         e.printStackTrace();

         out.print(JsonUtil.loadFalseResult(e.getMsg()));

      }

   }