From b2a68b1eaa6db1c1456534e084d66fe98e4443f0 Mon Sep 17 00:00:00 2001 From: peng <peng.com> Date: 星期四, 21 八月 2025 15:26:59 +0800 Subject: [PATCH] 抽奖活动 --- framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index f233523..43d2e79 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -164,14 +164,19 @@ @ApiModelProperty(value = "棰勫敭缁撴潫鏃堕棿") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date preSaleEndDate; @ApiModelProperty(value = "棰勫敭寮�濮嬫椂闂�") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") + @TableField(updateStrategy = FieldStrategy.IGNORED) private Date preSaleBeginDate; @ApiModelProperty(value = "鎶芥垚姣斾緥") private BigDecimal commission; + + @ApiModelProperty(value = "鍟嗗搧鎺掑簭") + private Integer goodsSort; public Goods() { } @@ -189,9 +194,15 @@ this.mobileIntro = goodsOperationDTO.getMobileIntro(); this.goodsVideo = goodsOperationDTO.getGoodsVideo(); this.price = goodsOperationDTO.getPrice(); + //涓嶆槸棰勫敭鍟嗗搧棰勫敭鏃堕棿缃┖ + if (!GoodsSalesModeEnum.PRESALE.name().equals(goodsOperationDTO.getSalesModel())) { + goodsOperationDTO.setPreSaleBeginDate(null); + goodsOperationDTO.setPreSaleEndDate(null); + } this.preSaleEndDate = goodsOperationDTO.getPreSaleEndDate(); this.preSaleBeginDate = goodsOperationDTO.getPreSaleBeginDate(); this.commission = goodsOperationDTO.getCommission(); + this.goodsSort = goodsOperationDTO.getGoodsSort(); if (goodsOperationDTO.getGoodsParamsDTOList() != null && goodsOperationDTO.getGoodsParamsDTOList().isEmpty()) { this.params = JSONUtil.toJsonStr(goodsOperationDTO.getGoodsParamsDTOList()); } -- Gitblit v1.8.0