From 5907ab96054805a67f254476e26ee8cf8277f908 Mon Sep 17 00:00:00 2001 From: Owen <595466820@qq.com> Date: Mon, 23 Dec 2024 00:01:22 +0800 Subject: [PATCH] Feat: Code gen V3 ok --- .../admin/product/vo/HaoKaProductRespVO.java | 7 ++++++- .../admin/product/vo/HaoKaProductSaveReqVO.java | 4 +++- .../dal/dataobject/product/HaoKaProductDO.java | 6 ++++++ .../product/HaoKaProductServiceImpl.java | 17 +++++++++++++++-- .../V3.0.16__alter_product_add_product_type.sql | 14 ++++++++++++++ 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 yudao-server/src/main/resources/db/migration/V3.0.16__alter_product_add_product_type.sql diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductRespVO.java index c03b329a9b..00b0114449 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductRespVO.java @@ -89,6 +89,11 @@ public class HaoKaProductRespVO { @ExcelProperty("预估收益") private String estimatedRevenue; + @Schema(description = "生产方式", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty(value = "生产方式", converter = DictConvert.class) + @DictFormat("haoka_auto_type") + private Integer autoType; + @Schema(description = "上架") @ExcelProperty("上架") private Boolean onSale; @@ -101,4 +106,4 @@ public class HaoKaProductRespVO { @ExcelProperty("创建时间") private LocalDateTime createTime; -} \ No newline at end of file +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductSaveReqVO.java index a108db7c8f..0bdd92ff79 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/product/vo/HaoKaProductSaveReqVO.java @@ -78,4 +78,6 @@ public class HaoKaProductSaveReqVO { @Schema(description = "是否顶置") private Boolean isTop; -} \ No newline at end of file + @Schema(description = "生产方式") + private Integer autoType; +} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/HaoKaProductDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/HaoKaProductDO.java index f32cac665c..cf6150cc41 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/HaoKaProductDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/product/HaoKaProductDO.java @@ -114,4 +114,10 @@ public class HaoKaProductDO extends BaseDO { */ private Long deptId; + /** + * 生产方式 + * + * 枚举 + */ + private Integer autoType; } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/HaoKaProductServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/HaoKaProductServiceImpl.java index b4646366b5..add48135a0 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/HaoKaProductServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/product/HaoKaProductServiceImpl.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.haoka.service.product; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import jakarta.annotation.Resource; @@ -7,6 +8,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; + import cn.iocoder.yudao.module.haoka.controller.admin.product.vo.*; import cn.iocoder.yudao.module.haoka.dal.dataobject.product.HaoKaProductDO; import cn.iocoder.yudao.module.haoka.dal.dataobject.superiorproductconfig.SuperiorProductConfigDO; @@ -27,7 +29,7 @@ import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.*; */ @Service @Validated -public class HaoKaProductServiceImpl extends ServiceImpl implements HaoKaProductService { +public class HaoKaProductServiceImpl extends ServiceImpl implements HaoKaProductService { @Resource private HaoKaProductMapper haoKaProductMapper; @@ -49,6 +51,18 @@ public class HaoKaProductServiceImpl extends ServiceImpl superiorProductConfigDOS = + superiorProductConfigMapper.selectList( + new LambdaQueryWrapperX() + .eqIfPresent(SuperiorProductConfigDO::getHaokaProductId, + updateReqVO.getId())); + if (superiorProductConfigDOS.isEmpty()) { + throw new IllegalArgumentException("该产品未配置自动生产模块,请先配置自动生产!"); + } + } haoKaProductMapper.updateById(updateObj); } @@ -106,7 +120,6 @@ public class HaoKaProductServiceImpl extends ServiceImpl