Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.taobao;



import java.io.InputStream;

import java.util.List;

import java.util.UUID;



import javax.annotation.Resource;

@@ -18,6 +19,7 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.db.MongoDBManager;

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

import com.yeshi.fanli.vo.brand.TaoBaoShopVO;



@Service

public class TaoBaoShopServiceImpl implements TaoBaoShopService {

@@ -99,8 +101,13 @@
         }

      }

      

		
      if (StringUtil.isNullOrEmpty(shopName) || "null".equalsIgnoreCase(shopName)) {

         shopName = null;

      }

		
      updateShop.setId(id);

      updateShop.setShopName(shopName);

      updateShop.setShopNameCustom(shopName);

      taoBaoShopMapper.updateByPrimaryKeySelective(updateShop);

   }

   

@@ -125,6 +132,18 @@
      return fileLink;

   }





   @Override

   public List<TaoBaoShopVO> listBrandShopinfo(long start, int count, Long cid) {

      return taoBaoShopMapper.listBrandShopinfo(start, count, cid);

   }





   @Override

   public long countBrandShopinfo(Long cid) {

      return taoBaoShopMapper.countBrandShopinfo(cid);

   }



   



}