yoho-search / yoho-search-consumer · Commits

Go to a project

Authored by Gino Zhang
Commit 319e372f3efc3674963d7d90b7bb1f53919e608f 2 parents 410cd22f fda5e5bb

Merge branch '0110' of git.yoho.cn:yoho-search/yoho-search-consumer into 0110

Inline Side-by-side
Showing 2 changed files with 6 additions and 2 deletions
@@ -29,6 +29,7 @@ public class ShopsLogicService { @@ -29,6 +29,7 @@ public class ShopsLogicService {
29 @Autowired 29 @Autowired
30 private BrandMapper brandMapper; 30 private BrandMapper brandMapper;
31 31
  32 +
32 /** 33 /**
33 * 增量 34 * 增量
34 * 35 *
@@ -23,7 +23,8 @@ public class TblShopsLogicService { @@ -23,7 +23,8 @@ public class TblShopsLogicService {
23 private ShopsBrandsMapper shopsBrandsMapper; 23 private ShopsBrandsMapper shopsBrandsMapper;
24 @Autowired 24 @Autowired
25 private BrandMapper brandMapper; 25 private BrandMapper brandMapper;
26 - 26 + @Autowired
  27 + private TblImgUrlLogicService tblImgUrlLogicService;
27 @Autowired 28 @Autowired
28 private TblBrandService tblBrandService; 29 private TblBrandService tblBrandService;
29 30
@@ -68,7 +69,9 @@ public class TblShopsLogicService { @@ -68,7 +69,9 @@ public class TblShopsLogicService {
68 shopsBO.setShopName(tblBrand.getBrandNameEn()); 69 shopsBO.setShopName(tblBrand.getBrandNameEn());
69 shopsBO.setShopDomain(""); 70 shopsBO.setShopDomain("");
70 shopsBO.setShopNature(0); 71 shopsBO.setShopNature(0);
71 - shopsBO.setShopLogo(tblBrand.getLogo()); 72 + if (tblBrand.getLogo() != null) {
  73 + shopsBO.setShopLogo(tblImgUrlLogicService.getTblImageUrl(tblBrand.getLogo() , true));
  74 + }
72 shopsBO.setWebsiteUrl(""); 75 shopsBO.setWebsiteUrl("");
73 shopsBO.setOtherUrl(""); 76 shopsBO.setOtherUrl("");
74 shopsBO.setShopAddress(""); 77 shopsBO.setShopAddress("");