diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderItem.java b/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderItem.java index 2390e7d5..850aa92d 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderItem.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderItem.java @@ -161,7 +161,7 @@ public class ShopOrderItem implements Serializable { private Integer order_item_saler_id; @ApiModelProperty(value = "分销商品编号") - private Long item_src_id; + private String item_src_id; @ApiModelProperty(value = "拆单同步状态") private Integer order_item_supplier_sync; diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductItem.java b/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductItem.java index 92593241..7fe99bc0 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductItem.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/product/ShopProductItem.java @@ -126,7 +126,7 @@ public class ShopProductItem implements Serializable { private Integer item_freetime; @ApiModelProperty(value = "供应商SKU编号") - private Long item_src_id; + private String item_src_id; @ApiModelProperty(value = "商品分类") private Integer category_id; diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java index b8c6838b..fe1c5dee 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java @@ -2596,8 +2596,8 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl product_item_rows = shopProductItemService.find(productItemQueryWrapper); for (ShopProductItem product_item_row : product_item_rows) { - Long item_src_id = product_item_row.getItem_src_id(); + String item_src_id = product_item_row.getItem_src_id(); Optional orderItemOpl = order_item_rows.stream().filter(s -> ObjectUtil.equal(s.getItem_id(), item_src_id)).findFirst(); if (orderItemOpl.isPresent()) { ShopOrderItem shopOrderItem = orderItemOpl.get(); @@ -5548,7 +5548,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl item_src_ids = order_item_rows.stream().map(s -> s.getItem_src_id()).distinct().collect(Collectors.toList()); + List item_src_ids = order_item_rows.stream().map(s -> s.getItem_src_id()).distinct().collect(Collectors.toList()); if (CollUtil.isNotEmpty(item_src_ids)) { List item_rows = new ArrayList(); @@ -5580,7 +5580,7 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl orderItemQueryWrapper = new QueryWrapper<>(); orderItemQueryWrapper.eq("item_id", itemSrcId); orderItemQueryWrapper.eq("src_order_id", order_id); 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 5360a881..e03fe269 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 @@ -502,6 +502,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl oneProductItemMap = oneProductItems.stream().collect(Collectors.toMap(ShopProductItem::getItem_src_id, ShopProductItem -> ShopProductItem, (k1, k2) -> k1)); + Map oneProductItemMap = oneProductItems.stream().collect(Collectors.toMap(ShopProductItem::getItem_src_id, ShopProductItem -> ShopProductItem, (k1, k2) -> k1)); if ($productItemMap.size() != oneProductItemMap.size()) { putDown = true; } else { - for (Long item_src_id : oneProductItemMap.keySet()) { + for (String item_src_id : oneProductItemMap.keySet()) { ShopProductItem $productItem = $productItemMap.get(item_src_id); if ($productItem == null) { @@ -4877,9 +4878,9 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl productItemMap = shopProductItems.stream().collect(Collectors.toMap(ShopProductItem::getItem_src_id, ShopProductItem -> ShopProductItem, (k1, k2) -> k1)); + Map productItemMap = shopProductItems.stream().collect(Collectors.toMap(ShopProductItem::getItem_src_id, ShopProductItem -> ShopProductItem, (k1, k2) -> k1)); - for (Long item_src_id : productItemMap.keySet()) { + for (String item_src_id : productItemMap.keySet()) { ShopProductItem $productItem = $productItemMap.get(item_src_id); if ($productItem == null) { @@ -4897,7 +4898,7 @@ public class ShopProductBaseServiceImpl extends BaseServiceImpl item_src_rows = new ArrayList<>(); Boolean supplier_market_enable = accountBaseConfigService.getConfig("supplier_market_enable", false); if (supplier_market_enable) { - List item_src_ids = itemList.stream().map(ShopProductItem::getItem_src_id).distinct().collect(Collectors.toList()); + List item_src_ids = itemList.stream().map(ShopProductItem::getItem_src_id).distinct().collect(Collectors.toList()); if (CollUtil.isNotEmpty(item_src_ids)) { item_src_rows = gets(CollUtil.join(item_src_ids, ",")); } @@ -2126,7 +2126,7 @@ public class ShopProductItemServiceImpl extends BaseServiceImpl itemOpl = item_src_rows.stream().filter(s -> ObjectUtil.equal(item_src_id, s.getItem_id())).findFirst(); if (itemOpl.isPresent() && CheckUtil.isNotEmpty(item_src_id)) { diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java index 16714710..9e369583 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java @@ -788,7 +788,7 @@ public abstract class SyncBaseThirdSxAbstract{ ShopProductItem shopProductItem = new ShopProductItem(); shopProductItem.setStore_id(storeIdInt); shopProductItem.setCategory_id(categoryId); - shopProductItem.setItem_src_id(jsonObj.getLong("product_number")); + shopProductItem.setItem_src_id(jsonObj.getStr("product_number")); //零售价 shopProductItem.setItem_unit_price(BigDecimal.valueOf(jsonObj.getDouble("retail_price"))); shopProductItem.setItem_advice_price(BigDecimal.valueOf(jsonObj.getDouble("retail_price"))); diff --git a/sql/shop/dev/20250704_ddl.sql b/sql/shop/dev/20250704_ddl.sql new file mode 100644 index 00000000..cf9d1f9f --- /dev/null +++ b/sql/shop/dev/20250704_ddl.sql @@ -0,0 +1 @@ +alter table shop_product_item modify `item_src_id` varchar(50) NOT NULL DEFAULT '0' COMMENT '供应商SKU编号'; \ No newline at end of file