diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java index 39a55e71..842d9492 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/product/service/impl/ShopProductBaseServiceImpl.java @@ -737,9 +737,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl productIds= shopNumberSeqService.batchCreateNextNo("product_id",1); - productId=productIds.get(0); - // productId = shopNumberSeqService.createNextNo("product_id"); + List productIds = shopNumberSeqService.batchCreateNextNo("product_id", 1); + productId = productIds.get(0); + // productId = shopNumberSeqService.createNextNo("product_id"); if (null == productId) { return Pair.of(false, I18nUtil._("生成商品编号异常!")); @@ -1035,9 +1035,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl itemIds= shopNumberSeqService.batchCreateNextNo("item_id",1); - item_id=itemIds.get(0); - // item_id = shopNumberSeqService.createNextNo("item_id"); + List itemIds = shopNumberSeqService.batchCreateNextNo("item_id", 1); + item_id = itemIds.get(0); + // item_id = shopNumberSeqService.createNextNo("item_id"); if (null == item_id) { return Pair.of(false, I18nUtil._("生成商品 ItemId 异常!")); @@ -1214,7 +1214,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl productIds= shopNumberSeqService.batchCreateNextNo("product_id",1); + List productIds = shopNumberSeqService.batchCreateNextNo("product_id", 1); Long $product_id = productIds.get(0); //Long $product_id = shopNumberSeqService.createNextNo("product_id"); @@ -1389,8 +1389,8 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl itemIds= shopNumberSeqService.batchCreateNextNo("item_id",1); - item_id=itemIds.get(0); + List itemIds = shopNumberSeqService.batchCreateNextNo("item_id", 1); + item_id = itemIds.get(0); //item_id = shopNumberSeqService.createNextNo("item_id"); if (null == item_id) { @@ -2074,11 +2074,11 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl store_biz_state = shopStoreBaseService.getStoreBizState(Convert.toInt(product_base_row.get("store_id"))); -// product_base_row.put("store_biz_state", store_biz_state.getFirst()); -// } + if (product_base_row != null) { + // 获取店铺营业状态:1-开业营业中(且在营业时间内);12-开业打烊中(但在营业时间外) ;2-停业中;3-开业(或活动)筹备中; + Pair store_biz_state = shopStoreBaseService.getStoreBizState(Convert.toInt(product_base_row.get("store_id"))); + product_base_row.put("store_biz_state", store_biz_state.getFirst()); + } //虚拟销量 // todo 是否为商家后台访问 @@ -4995,9 +4995,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl itemIds= shopNumberSeqService.batchCreateNextNo("item_id",1); - item_id=itemIds.get(0); + // item_id = shopNumberSeqService.createNextNo("item_id"); + List itemIds = shopNumberSeqService.batchCreateNextNo("item_id", 1); + item_id = itemIds.get(0); if (null == item_id) { throw new ApiException(I18nUtil._("生成商品ItemId异常!")); } else { diff --git a/pom.xml b/pom.xml index 01d2025e..993e72b7 100644 --- a/pom.xml +++ b/pom.xml @@ -593,7 +593,7 @@ true ${project.version} - latest + @@ -601,9 +601,9 @@ - - rm -rf /root/.m2 && rm -rf /tmp/* && rm -rf /var/cache/* - + + +