Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
3aef824fbe
@ -106,7 +106,7 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
|
||||
private static final String TEMPLATE_NAME = "商品映射模板.xlsx";
|
||||
private static final String EXPORT_NAME = "商品映射数据.xlsx";
|
||||
|
||||
private final Integer SHOPBASEPAGE=500;
|
||||
private final Integer SHOPBASEPAGE=300;
|
||||
@Qualifier("redisService")
|
||||
@Autowired
|
||||
private RedisService redisService;
|
||||
@ -418,6 +418,10 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
|
||||
if(null==shopBaseProductSpec){
|
||||
shopBaseProductSpec= (ShopBaseProductSpec) ShopBaseProductSpecMap.get(String.valueOf(categoryId));
|
||||
}
|
||||
if(null==shopBaseProductSpec){
|
||||
log.info("categoryId:{},productNumber:{}",categoryId,productNumber);
|
||||
return null;
|
||||
}
|
||||
Integer specId= shopBaseProductSpec.getSpec_id();
|
||||
ShopProductSpecItem addShopProductSpecItem=new ShopProductSpecItem();
|
||||
ProductMapping productMapping= (ProductMapping) productMappingMap.get(productNumber);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user