From 7ac5794d37d45b5feb7e01839fd06b1267108fd4 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Thu, 25 Sep 2025 21:24:23 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9AstoreProductColorSize=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0storeId=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/migartion/GtAndFhbBizController.java | 2 +- sql/ry_20240629.sql | 1 + .../com/ruoyi/xkt/domain/StoreProductColorSize.java | 8 +++++--- .../xkt/service/impl/StoreProductServiceImpl.java | 4 ++-- .../resources/mapper/StoreProductColorSizeMapper.xml | 10 ++++++---- 5 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java index 884e9c63a..38a17c65d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/migartion/GtAndFhbBizController.java @@ -356,7 +356,7 @@ public class GtAndFhbBizController extends BaseController { final String otherSnPrefix = fhbMatchSkuList.get(i).getSupplierId() + String.format("%05d", fhbMatchSkuList.get(i).getSupplierSkuId()) + Constants.SIZE_LIST.get(j); prodColorSizeList.add(new StoreProductColorSize().setSize(Constants.SIZE_LIST.get(j)).setStoreColorId(storeColor.getId()) - .setStoreProdId(storeProd.getId()).setPrice(minPrice).setOtherSnPrefix(otherSnPrefix).setNextSn(0) + .setStoreProdId(storeProd.getId()).setPrice(minPrice).setOtherSnPrefix(otherSnPrefix).setNextSn(0).setStoreId(storeProd.getStoreId()) .setStandard(gtStandardSizeList.contains(Constants.SIZE_LIST.get(j)) ? 1 : 0)); } } diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index 60b5c4834..08f6981de 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -3526,6 +3526,7 @@ CREATE TABLE `store_product_color_size` `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '档口商品颜色尺码ID', `store_color_id` bigint UNSIGNED NOT NULL COMMENT '档口商品颜色ID', `store_prod_id` bigint UNSIGNED NOT NULL COMMENT '档口商品ID', + `store_id` bigint UNSIGNED NOT NULL COMMENT '档口ID', `size` int UNSIGNED NOT NULL COMMENT '商品尺码', `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '档口商品定价', `sn_prefix` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '档口商品颜色尺码的前缀', diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java index 4fa1a38e6..b169d0172 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java +++ b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorSize.java @@ -6,15 +6,13 @@ import com.ruoyi.common.core.domain.XktBaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.math.BigDecimal; /** * 档口商品颜色的尺码对象 store_product_color_size * 条码规则 5位档口ID + 8位 store_product_color_size.id + 8位 nextBarcode - * eg: 100010000000100000001 + * eg: 100010000000100000001 * * @author ruoyi * @date 2025-03-26 @@ -40,6 +38,10 @@ public class StoreProductColorSize extends XktBaseEntity { */ @Excel(name = "档口商品ID") private Long storeProdId; + /** + * 档口ID + */ + private Long storeId; /** * 商品尺码 */ diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java index de7ff8e7b..ac604bc1a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java @@ -405,7 +405,7 @@ public class StoreProductServiceImpl implements IStoreProductService { // 不存在则新增 dbProdColorSizeList.add(new StoreProductColorSize().setSize(updateColorSize.getSize()).setStoreProdId(storeProdId) .setStandard(updateColorSize.getStandard()).setStoreColorId(storeColorMap.get(updateColorSize.getColorName())) - .setPrice(updateColorSize.getPrice()).setNextSn(0)); + .setPrice(updateColorSize.getPrice()).setNextSn(0).setStoreId(storeId)); } }); this.storeProdColorSizeMapper.insertOrUpdate(dbProdColorSizeList); @@ -496,7 +496,7 @@ public class StoreProductServiceImpl implements IStoreProductService { this.storeProdColorMapper.insert(prodColorList); // 新增档口颜色尺码对应价格 List prodColorSizeList = createDTO.getSizeList().stream().map(x -> new StoreProductColorSize().setSize(x.getSize()).setStoreProdId(storeProdId) - .setStandard(x.getStandard()).setStoreColorId(storeColorMap.get(x.getColorName())).setPrice(x.getPrice()).setNextSn(0)) + .setStandard(x.getStandard()).setStoreColorId(storeColorMap.get(x.getColorName())).setPrice(x.getPrice()).setNextSn(0).setStoreId(storeId)) .collect(Collectors.toList()); this.storeProdColorSizeMapper.insert(prodColorSizeList); // 设置档口商品价格尺码的barcode_prefix diff --git a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml index b81e949ec..172b33d9e 100644 --- a/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml +++ b/xkt/src/main/resources/mapper/StoreProductColorSizeMapper.xml @@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE spcs.del_flag = 0 AND spcs.sn_prefix = #{snPrefix} - AND sp.store_id = #{storeId} + AND spcs.store_id = #{storeId}