品牌商品优化

yujian

2019-04-28 c0f13add249efc60e02ea4a306ab0b464ed69353

 fanli/src/main/java/com/yeshi/fanli/controller/client/BrandController.java

@@ -164,6 +164,22 @@
            for (TaoBaoShopHistory history : listHistory) {

               TaoBaoShop taoBaoShop = history.getTaoBaoShop();

               if (taoBaoShop != null) {

						
                  String shopLink = taoBaoShop.getShopLink();

                  if (StringUtil.isNullOrEmpty(shopLink)) {

                     taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));

                  }

						
                  String shopNameCustom = taoBaoShop.getShopNameCustom();

                  if (!StringUtil.isNullOrEmpty(shopNameCustom)) {

                     taoBaoShop.setShopName(shopNameCustom);

                  }

						
                  String shopIconCustom = taoBaoShop.getShopIconCustom();

                  if (!StringUtil.isNullOrEmpty(shopIconCustom)) {

                     taoBaoShop.setShopIcon(shopIconCustom);

                  }

						
                  list.add(taoBaoShop);

               }

            }

@@ -215,7 +231,20 @@
            if (taoBaoShop == null) {

               out.print(JsonUtil.loadFalseResult("店铺信息获取失败"));

            }

            taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));

            String shopLink = taoBaoShop.getShopLink();

            if (StringUtil.isNullOrEmpty(shopLink)) {

               taoBaoShop.setShopLink(TaoBaoUtil.getShopLink(taoBaoShop.getId()));

            }

				
            String shopNameCustom = taoBaoShop.getShopNameCustom();

            if (!StringUtil.isNullOrEmpty(shopNameCustom)) {

               taoBaoShop.setShopName(shopNameCustom);

            }

				
            String shopIconCustom = taoBaoShop.getShopIconCustom();

            if (!StringUtil.isNullOrEmpty(shopIconCustom)) {

               taoBaoShop.setShopIcon(shopIconCustom);

            }

            data.put("shop", taoBaoShop);

         }