Skip to content

Y
yd-product
Commit a0a4faff by zhangxingmin
Options

审核-产品上架信息

parent 088449dd
Showing with 64 additions and 21 deletions
yd-product-api/src/main/java/com/yd/product/api/service/impl/ApiProductLaunchServiceImpl.java
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClient; import com.yd.base.feign.client.relobjectcategory.ApiRelObjectCategoryFeignClient;
import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest; import com.yd.base.feign.request.relobjectcategory.ApiRelObjectCategoryListAddRequest;
import com.yd.common.enums.CommonEnum; import com.yd.common.enums.CommonEnum;
import com.yd.common.enums.NoYesEnum;
import com.yd.common.exception.BusinessException; import com.yd.common.exception.BusinessException;
import com.yd.common.result.Result; import com.yd.common.result.Result;
import com.yd.common.utils.RandomStringGenerator; import com.yd.common.utils.RandomStringGenerator;
...@@ -211,8 +212,14 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService { ...@@ -211,8 +212,14 @@ public class ApiProductLaunchServiceImpl implements ApiProductLaunchService {
productLaunch.setApprovalRemark(request.getApprovalRemark()); productLaunch.setApprovalRemark(request.getApprovalRemark());
if (ProductCommonEnum.APPROVAL_STATUS_TG.getItemValue().equals(request.getApprovalStatus())){ if (ProductCommonEnum.APPROVAL_STATUS_TG.getItemValue().equals(request.getApprovalStatus())){
//审核通过 -> 更新上架状态和更新租户/项目产品上架关系数据 //审核通过 -> 更新上架状态和更新租户/项目产品上架关系数据
//更新上架状态为在售状态 //定时开始是否开启，开启-待开售状态 关闭-在售状态
productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_ZS.getItemValue()); if (NoYesEnum.YES.getItemValue().equals(productLaunch.getIsTiming())) {
//定时开始是否开启，开启-待开售状态
productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_DKS.getItemValue());
}else if (NoYesEnum.NO.getItemValue().equals(productLaunch.getIsTiming())){
//关闭-在售状态
productLaunch.setStatus(ProductCommonEnum.PRODUCT_LAUNCH_STATUS_ZS.getItemValue());
}
iProductLaunchService.saveOrUpdate(productLaunch); iProductLaunchService.saveOrUpdate(productLaunch);
//更新租户/项目产品上架关系数据 //更新租户/项目产品上架关系数据
......
yd-product-feign/src/main/java/com/yd/product/feign/dto/ApiProductLaunchDto.java
...@@ -3,6 +3,7 @@ package com.yd.product.feign.dto; ...@@ -3,6 +3,7 @@ package com.yd.product.feign.dto;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
@Data @Data
...@@ -48,7 +49,22 @@ public class ApiProductLaunchDto { ...@@ -48,7 +49,22 @@ public class ApiProductLaunchDto {
/** /**
* 状态：0-待审核 1-审核成功 2-审核失败 3-在售 4-停售 5-下架 6-预售 * 状态：0-待审核 1-审核成功 2-审核失败 3-在售 4-停售 5-下架 6-预售
*/ */
private Integer status; private String status;
/**
* 是否定时开售 0-否 1-是
*/
private String isTiming;
/**
* 开售日期
*/
private LocalDateTime releaseDate;
/**
* 是否隐藏价格（是否定时开售为是的时候才设置这个） 0-否 1-是
*/
private String isHiddenPrice;
/** /**
* 上架到对应的项目列表 * 上架到对应的项目列表
......
yd-product-feign/src/main/java/com/yd/product/feign/enums/ProductCommonEnum.java
...@@ -13,6 +13,7 @@ public enum ProductCommonEnum { ...@@ -13,6 +13,7 @@ public enum ProductCommonEnum {
PRODUCT_LAUNCH_STATUS_TS("停售","TS"), PRODUCT_LAUNCH_STATUS_TS("停售","TS"),
PRODUCT_LAUNCH_STATUS_XJ("下架","XJ"), PRODUCT_LAUNCH_STATUS_XJ("下架","XJ"),
PRODUCT_LAUNCH_STATUS_YS("预售","YS"), PRODUCT_LAUNCH_STATUS_YS("预售","YS"),
PRODUCT_LAUNCH_STATUS_DKS("待开售","DKS"),
//审核操作状态 //审核操作状态
APPROVAL_STATUS_TG("通过","TG"), APPROVAL_STATUS_TG("通过","TG"),
......
yd-product-service/src/main/java/com/yd/product/service/model/ProductLaunch.java
...@@ -4,18 +4,19 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,18 +4,19 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.io.Serializable;
import java.time.LocalDateTime;
/** /**
* <p> * <p>
* 产品上架信息表（新表） * 产品上架信息表
* </p> * </p>
* *
* @author zxm * @author zxm
* @since 2025-11-20 * @since 2025-11-27
*/ */
@Getter @Getter
@Setter @Setter
...@@ -73,25 +74,25 @@ public class ProductLaunch implements Serializable { ...@@ -73,25 +74,25 @@ public class ProductLaunch implements Serializable {
private String detailDescription; private String detailDescription;
/** /**
* 作用域(1:系统级（全局） 2:租户级 3:项目级) * 是否定时开售 0-否 1-是
*/ */
@TableField("scope") @TableField("is_timing")
private Integer scope; private String isTiming;
/** /**
* 所属租户ID（业务id） * 开售日期
*/ */
@TableField("tenant_biz_id") @TableField("release_date")
private String tenantBizId; private LocalDateTime releaseDate;
/** /**
* 所属项目ID（业务id） * 是否隐藏价格（是否定时开售为是的时候才设置这个） 0-否 1-是
*/ */
@TableField("project_biz_id") @TableField("is_hidden_price")
private String projectBizId; private String isHiddenPrice;
/** /**
* 上架状态 * 状态：0-待审核 1-审核成功 2-审核失败 3-在售 4-停售 5-下架 6-预售
*/ */
@TableField("status") @TableField("status")
private String status; private String status;
...@@ -103,12 +104,30 @@ public class ProductLaunch implements Serializable { ...@@ -103,12 +104,30 @@ public class ProductLaunch implements Serializable {
private String approvalRemark; private String approvalRemark;
/** /**
* 上架到对应的项目列表（多个项目id分号分隔） * 上架到对应的项目列表（多个项目id分号分隔）（冗余）
*/ */
@TableField("project_biz_id_list") @TableField("project_biz_id_list")
private String projectBizIdList; private String projectBizIdList;
/** /**
* 作用域(1:系统级（全局） 2:租户级 3:项目级)
*/
@TableField("scope")
private Integer scope;
/**
* 所属租户ID（业务id）
*/
@TableField("tenant_biz_id")
private String tenantBizId;
/**
* 所属项目ID（业务id）
*/
@TableField("project_biz_id")
private String projectBizId;
/**
* 通用备注 * 通用备注
*/ */
@TableField("remark") @TableField("remark")
......
yd-product-service/src/main/java/com/yd/product/service/utils/MyBatisPlusCodeGenerator.java
...@@ -8,8 +8,8 @@ public class MyBatisPlusCodeGenerator { ...@@ -8,8 +8,8 @@ public class MyBatisPlusCodeGenerator {
FastAutoGenerator.create("jdbc:mysql://139.224.145.34:3308/yd_product?serverTimezone=GMT%2B8", "root", "Zxm7320017") FastAutoGenerator.create("jdbc:mysql://139.224.145.34:3308/yd_product?serverTimezone=GMT%2B8", "root", "Zxm7320017")
.globalConfig(builder -> { .globalConfig(builder -> {
builder.author("zxm") builder.author("zxm")
// .outputDir("src/main/java/com/yd/csf/service"); .outputDir("src/main/java/com/yd/product/service");
.outputDir("D:/soft/ideaproject/v2/yd-product/yd-product-service/src/main/java"); // .outputDir("D:/soft/ideaproject/v2/yd-product/yd-product-service/src/main/java");
}) })
.packageConfig(builder -> { .packageConfig(builder -> {
builder.parent("com.yd.product.service") builder.parent("com.yd.product.service")
...@@ -21,7 +21,7 @@ public class MyBatisPlusCodeGenerator { ...@@ -21,7 +21,7 @@ public class MyBatisPlusCodeGenerator {
}) })
.strategyConfig(builder -> { .strategyConfig(builder -> {
builder.addInclude( builder.addInclude(
"announcement_commission_ratio" "product_launch"
) )
.entityBuilder() .entityBuilder()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment