Authored by wangnan

fix

... ... @@ -60,23 +60,26 @@ public class ShopsLogicService {
List<ShopsBO> shopsBOs = new ArrayList<>();
for (Shops shop : shopss) {
List<ShopsBrands> shopsBrandss = shopsBrandsMapper.selectByShopId(shop.getShopsId());
if(CollectionUtils.isEmpty(shopsBrandss)){
continue;
}
StringBuilder brandName = new StringBuilder();
StringBuilder brandNameCn = new StringBuilder();
StringBuilder brandNameEn = new StringBuilder();
StringBuilder brandDomain = new StringBuilder();
for (ShopsBrands shopsBrand : shopsBrandss) {
Brand brand = brandMapper.selectByPrimaryKey(shopsBrand.getBrandId());
if (brand != null) {
brandName.append(brand.getBrandName() + ",");
brandNameCn.append(brand.getBrandNameCn() + ",");
brandNameEn.append(brand.getBrandNameEn() + ",");
brandDomain.append(brand.getBrandDomain() + ",");
ShopsBO shopsBO = new ShopsBO();
if(!CollectionUtils.isEmpty(shopsBrandss)){
StringBuilder brandName = new StringBuilder();
StringBuilder brandNameCn = new StringBuilder();
StringBuilder brandNameEn = new StringBuilder();
StringBuilder brandDomain = new StringBuilder();
for (ShopsBrands shopsBrand : shopsBrandss) {
Brand brand = brandMapper.selectByPrimaryKey(shopsBrand.getBrandId());
if (brand != null) {
brandName.append(brand.getBrandName() + ",");
brandNameCn.append(brand.getBrandNameCn() + ",");
brandNameEn.append(brand.getBrandNameEn() + ",");
brandDomain.append(brand.getBrandDomain() + ",");
}
}
shopsBO.setBrandName(brandName.toString());
shopsBO.setBrandNameCn(brandNameCn.toString());
shopsBO.setBrandNameEn(brandNameEn.toString());
shopsBO.setBrandDomain(brandDomain.toString());
}
ShopsBO shopsBO = new ShopsBO();
shopsBO.setShopsId(shop.getShopsId());
shopsBO.setShopName(shop.getShopName());
shopsBO.setShopDomain(shop.getShopDomain());
... ... @@ -95,10 +98,7 @@ public class ShopsLogicService {
shopsBO.setUpdateTime(shop.getUpdateTime());
shopsBO.setBlkStatus(shop.getBlkStatus());
//shopsBO.setShopIntro(shop.getShopIntro());
shopsBO.setBrandName(brandName.toString());
shopsBO.setBrandNameCn(brandNameCn.toString());
shopsBO.setBrandNameEn(brandNameEn.toString());
shopsBO.setBrandDomain(brandDomain.toString());
shopsBOs.add(shopsBO);
}
... ...