From 7ae6893e2746869f879d270544b7804a82ea88a9 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 19 九月 2025 14:20:42 +0800
Subject: [PATCH] 会员列表导出
---
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 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 d8b663a..2882af1 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
@@ -17,17 +17,21 @@
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xkcoding.http.util.StringUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
+import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.Map;
/**
@@ -157,6 +161,26 @@
@ApiModelProperty(value = "鍟嗗搧鍙傛暟json", hidden = true)
private String params;
+ @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;
+
+ @ApiModelProperty(value ="琛ㄧず铏氭嫙鍟嗗搧绫诲瀷 鐜版湁绫诲瀷锛欳OUPON浼樻儬鍔�")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ private String virtualGoodsType;
public Goods() {
}
@@ -175,6 +199,17 @@
this.mobileIntro = goodsOperationDTO.getMobileIntro();
this.goodsVideo = goodsOperationDTO.getGoodsVideo();
this.price = goodsOperationDTO.getPrice();
+ this.virtualGoodsType = goodsOperationDTO.getVirtualGoodsType();
+
+ //涓嶆槸棰勫敭鍟嗗搧棰勫敭鏃堕棿缃┖
+ 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());
}
@@ -202,6 +237,12 @@
if (!sku.containsKey("quantity") || StringUtil.isEmpty(sku.get("quantity").toString()) || Convert.toInt(sku.get("quantity").toString()) < 0) {
throw new ServiceException(ResultCode.GOODS_SKU_QUANTITY_ERROR);
}
+ //娌℃湁浼樻儬鍗风殑鍟嗗搧闇�瑕佺Щ闄や紭鎯犲嵎淇℃伅
+ Object couponId = sku.get("couponId");
+ if (couponId == null || StringUtil.isEmpty(couponId.toString())) {
+ sku.remove("couponId");
+ sku.remove("couponName");
+ }
sku.values().forEach(i -> {
if (CharSequenceUtil.isBlank(i.toString())) {
throw new ServiceException(ResultCode.MUST_HAVE_GOODS_SKU_VALUE);
--
Gitblit v1.8.0