Merge remote-tracking branch 'origin/main'

This commit is contained in:
Jack 2025-10-31 09:41:50 +08:00
commit 3aef824fbe

View File

@ -106,7 +106,7 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
private static final String TEMPLATE_NAME = "商品映射模板.xlsx"; private static final String TEMPLATE_NAME = "商品映射模板.xlsx";
private static final String EXPORT_NAME = "商品映射数据.xlsx"; private static final String EXPORT_NAME = "商品映射数据.xlsx";
private final Integer SHOPBASEPAGE=500; private final Integer SHOPBASEPAGE=300;
@Qualifier("redisService") @Qualifier("redisService")
@Autowired @Autowired
private RedisService redisService; private RedisService redisService;
@ -418,6 +418,10 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
if(null==shopBaseProductSpec){ if(null==shopBaseProductSpec){
shopBaseProductSpec= (ShopBaseProductSpec) ShopBaseProductSpecMap.get(String.valueOf(categoryId)); shopBaseProductSpec= (ShopBaseProductSpec) ShopBaseProductSpecMap.get(String.valueOf(categoryId));
} }
if(null==shopBaseProductSpec){
log.info("categoryId:{},productNumber:{}",categoryId,productNumber);
return null;
}
Integer specId= shopBaseProductSpec.getSpec_id(); Integer specId= shopBaseProductSpec.getSpec_id();
ShopProductSpecItem addShopProductSpecItem=new ShopProductSpecItem(); ShopProductSpecItem addShopProductSpecItem=new ShopProductSpecItem();
ProductMapping productMapping= (ProductMapping) productMappingMap.get(productNumber); ProductMapping productMapping= (ProductMapping) productMappingMap.get(productNumber);