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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java

@@ -141,6 +141,8 @@
      // 删除店铺

       brandShopCaheService.removeByDateAndType(brandInfo.getId(), 20, date);

       

       boolean addShop = true;

	    
      for (int i=0; i < 2;i ++) {

         if ("1".equals(way)) {

            JDFilter filterAPI = new JDFilter();

@@ -162,7 +164,6 @@
         }

         

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

            boolean addShop = true;

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

            for (JDGoods goods : goodsList) {

               BrandGoodsCahe brandGoods = new BrandGoodsCahe();

@@ -178,8 +179,8 @@
                  // 包含该品牌名称

                  String shopName = shopInfo.getShopName();

                  if (!StringUtil.isNullOrEmpty(shopName) && shopName.contains(brandInfo.getName())) {

                     brandShopCaheService.addBrandShopJD(brandInfo, shopInfo);

                     addShop = false;

                     brandShopCaheService.addBrandShopJD(brandInfo, shopInfo);

                  }

               }