From 535ef3c80be953d618c92e2e25abf10770527a46 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 15 Sep 2025 17:25:22 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=BD=BB=E5=BA=95=E4=BB=8E?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=8E=BB=E6=8E=89StoreProductColorP?= =?UTF-8?q?rice=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ry_20240629.sql | 22 ------ .../xkt/domain/StoreProductColorPrice.java | 75 ------------------- .../mapper/StoreProductColorPriceMapper.java | 15 ---- .../service/impl/StoreProductServiceImpl.java | 11 +-- .../mapper/StoreProductColorPriceMapper.xml | 9 --- 5 files changed, 3 insertions(+), 129 deletions(-) delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java delete mode 100644 xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java delete mode 100644 xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml diff --git a/sql/ry_20240629.sql b/sql/ry_20240629.sql index e4a90e5a1..e176a937f 100644 --- a/sql/ry_20240629.sql +++ b/sql/ry_20240629.sql @@ -3501,28 +3501,6 @@ CREATE TABLE `store_product_color` INDEX `idx_spc_prodid_colorid_del`(`store_prod_id`, `store_color_id`, `del_flag`) USING BTREE ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档口当前商品颜色' ROW_FORMAT = DYNAMIC; - - --- ---------------------------- --- Table structure for store_product_color_price --- ---------------------------- -/*DROP TABLE IF EXISTS `store_product_color_price`; -CREATE TABLE `store_product_color_price` -( - `id` bigint UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '档口商品颜色价格ID', - `store_prod_id` bigint UNSIGNED NOT NULL COMMENT '档口商品ID', - `store_color_id` bigint UNSIGNED NOT NULL COMMENT '档口颜色ID', - `price` decimal(10, 2) UNSIGNED NOT NULL COMMENT '档口商品定价', - `version` bigint UNSIGNED NOT NULL COMMENT '版本号', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '删除标志（0代表存在 2代表删除）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '创建者', - `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '更新者', - `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE, - INDEX `idx_spcp_prodid_colorid_del`(`store_prod_id`, `store_color_id`, `del_flag`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '档口商品颜色定价' ROW_FORMAT = DYNAMIC; -*/ -- ---------------------------- -- Table structure for store_product_color_size -- ---------------------------- diff --git a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java b/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java deleted file mode 100644 index f108e9962..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/domain/StoreProductColorPrice.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.ruoyi.xkt.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.ruoyi.common.annotation.Excel; -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_price - * - * @author ruoyi - * @date 2025-03-26 - */ -/* -@EqualsAndHashCode(callSuper = true) -@Data -@Accessors(chain = true) -public class StoreProductColorPrice extends XktBaseEntity { - private static final long serialVersionUID = 1L; - - */ -/** - * 档口商品颜色价格ID - *//* - - @TableId - private Long id; - - */ -/** - * 档口颜色ID - *//* - - @Excel(name = "档口颜色ID") - private Long storeColorId; - - */ -/** - * 档口商品ID - *//* - - @Excel(name = "档口商品ID") - private Long storeProdId; - - */ -/** - * 档口商品定价 - *//* - - @Excel(name = "档口商品定价") - private BigDecimal price; - - - @Override - public String toString() { - return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("storeProdId", getStoreProdId()) - .append("price", getPrice()) - .append("version", getVersion()) - .append("delFlag", getDelFlag()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .toString(); - } -} -*/ diff --git a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java b/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java deleted file mode 100644 index b475fac99..000000000 --- a/xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductColorPriceMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.ruoyi.xkt.mapper; - -import org.springframework.stereotype.Repository; - -/** - * 档口商品颜色定价Mapper接口 - * - * @author ruoyi - * @date 2025-03-26 - */ -//@Repository -//public interface StoreProductColorPriceMapper extends BaseMapper { -// -// -//} 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 9b79ee24e..4d879fa0c 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 @@ -591,9 +591,9 @@ public class StoreProductServiceImpl implements IStoreProductService { public List prepareGetPicPackDownloadUrl(Long storeProductId) { Assert.notNull(storeProductId); List productFiles = storeProdFileMapper.selectList(Wrappers.lambdaQuery(StoreProductFile.class) - .eq(StoreProductFile::getStoreProdId, storeProductId) - .in(StoreProductFile::getFileType, FileType.picPackValues()) - .eq(XktBaseEntity::getDelFlag, UNDELETED)) + .eq(StoreProductFile::getStoreProdId, storeProductId) + .in(StoreProductFile::getFileType, FileType.picPackValues()) + .eq(XktBaseEntity::getDelFlag, UNDELETED)) .stream() .collect(Collectors.toList()); if (CollUtil.isEmpty(productFiles)) { @@ -994,11 +994,6 @@ public class StoreProductServiceImpl implements IStoreProductService { // 档口类目属性 this.storeProdCateAttrMapper.insert(BeanUtil.toBean(storeProdDTO.getCateAttr(), StoreProductCategoryAttribute.class) .setStoreProdId(storeProd.getId()).setStoreId(storeProd.getStoreId())); - // 档口颜色价格列表 -// List priceList = storeProdDTO.getPriceList().stream().map(x -> BeanUtil.toBean(x, StoreProductColorPrice.class) -// .setStoreProdId(storeProd.getId()).setStoreColorId(storeColorMap.get(x.getColorName()).getId())) -// .collect(Collectors.toList()); -// this.storeProdColorPriceMapper.insert(priceList); // 档口详情内容 StoreProductDetail storeProdDetail = new StoreProductDetail().setDetail(storeProdDTO.getDetail()).setStoreProdId(storeProd.getId()); this.storeProdDetailMapper.insert(storeProdDetail); diff --git a/xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml b/xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml deleted file mode 100644 index fc63395e2..000000000 --- a/xkt/src/main/resources/mapper/StoreProductColorPriceMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file