资金验证优化

admin

2020-08-26 26f7accb815f55f18f8eedfca4324700a96884ec

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

@@ -26,14 +26,14 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;

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

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

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

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

import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.common.entity.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

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

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


      List<CommonContentNav> list = null;

      if (type == null || type == Constant.SOURCE_TYPE_TAOBAO) {

         list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key));

         list = commonTemplateContentService.getNavList(CommonContentTypeEnum.valueOf(key),acceptData.getSystem());

      } else if (type == Constant.SOURCE_TYPE_JD) {

         // 暂无分类

      } else if (type == Constant.SOURCE_TYPE_PDD) {

@@ -149,7 +149,7 @@
         result = guessLikeDeviceTB(idfa, imei, acceptData.getUtdid(), page);

      } else {

         // 大淘客页码只能为10,50,100,200

         result = commonTemplateContentService.getContentList(type, cid, page, 10);

         result = commonTemplateContentService.getContentList(type, cid, page, 10,acceptData.getSystem());

      }



      JSONObject root = new JSONObject();

@@ -166,7 +166,7 @@
         goodsList = result.getGoodsList();



      ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

            acceptData.getVersion());

            acceptData.getVersion(),acceptData.getSystem());

      for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {

         GoodsDetailVO vo = GoodsDetailVOFactory.convertTaoBao(taoBaoGoodsBrief, paramsDTO);

         if (type == CommonContentTypeEnum.mianDan)// 免单商品

@@ -215,7 +215,7 @@
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());

                  acceptData.getVersion(),acceptData.getSystem());



            for (JDGoods goods : goodsList) {

               array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, paramsDTO)));

@@ -244,7 +244,7 @@
         List<BannerVO> bannerList = null;

         if (Constant.IS_TEST) {

            bannerList = swiperPictureService.getByBannerCardAndVersion("index_top", acceptData.getPlatform(),

                  Integer.parseInt(acceptData.getVersion()));

                  Integer.parseInt(acceptData.getVersion()),acceptData.getSystem());

         }



         if (bannerList == null) {

@@ -266,7 +266,7 @@
            Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())

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

            ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),

                  acceptData.getVersion());

                  acceptData.getVersion(),acceptData.getSystem());



            for (PDDGoodsDetail goods : goodsList) {

               array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, paramsDTO)));