From f20015f5b2a2ac70dcb640d524196efe2c6786d3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 01 九月 2025 17:14:40 +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