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

yujian

2019-07-30 dadacf7c1065876248bec86cf17c06ca4be1b97c

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

@@ -76,13 +76,8 @@
         return;

      }

      

      if (type == null) {

         out.print(JsonUtil.loadFalseResult(1, "请传入类型"));

         return;

      }

		
      List<CommonContentNav> list = null;

      if (type == Constant.SOURCE_TYPE_TAOBAO) {

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

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

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

         // 暂无分类

@@ -118,12 +113,7 @@
         return;

      }



      if (type == null) {

         out.print(JsonUtil.loadFalseResult(1, "请传入类型"));

         return;

      }

		
      if (type == Constant.SOURCE_TYPE_TAOBAO) {

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

         getListTB(acceptData, key, page, cid, out);

         return;

      }

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

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

            for (JDGoods goods : goodsList) {

               array.add(gson.toJson(GoodsDetailVOFactory.convertJDGoods(goods, null, fanLiRate, shareRate)));

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

            }

         }

      }

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

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

            for (PDDGoodsDetail goods : goodsList) {

               array.add(gson.toJson(GoodsDetailVOFactory.convertPDDGoods(goods, null, fanLiRate, shareRate)));

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

            }

         }

      }