From 74a6e1398a437aafa070edca794b3c262735671a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 20:25:47 +0800
Subject: [PATCH] 20210624 商品分类
---
gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java | 3 +++
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java | 6 ++++++
gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java | 2 +-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
index 61cf63f..ba6f0f7 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/ScoreGoods.java
@@ -1,6 +1,7 @@
package com.xzx.gc.entity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.xzx.gc.common.entity.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,8 +45,10 @@
public static final Integer ISQG_YES = 1;
public static final Integer ISQG_NO = 2;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date qgStartTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date qgEndTime;
private Integer isSale;
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
index 2b48c4f..f54e534 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
@@ -71,7 +71,7 @@
private List<String> goodsImages;
@ApiModelProperty(value="积分商品样式")
- private List<ScoreGoodsStyleDto> scoreGoodsStyleDtos;
+ private List<ScoreGoodsStyleDto> scoreGoodsStyles;
@ApiModelProperty(value="创建人")
private String createdBy;
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
index b8408e6..4082490 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java
@@ -118,7 +118,7 @@
scoreGoods.setDelFlag(Convert.toShort(Constants.DEL_NOT_FLAG));
scoreGoodsMapper.insert(scoreGoods);
//样式信息
- List<ScoreGoodsStyleDto> scoreGoodsStyleDtos = model.getScoreGoodsStyleDtos();
+ List<ScoreGoodsStyleDto> scoreGoodsStyleDtos = model.getScoreGoodsStyles();
if(CollUtil.isNotEmpty(scoreGoodsStyleDtos)){
for(ScoreGoodsStyleDto scoreGoodsStyleDto : scoreGoodsStyleDtos){
ScoreGoodsStyle scoreGoodsStyle = objectMapper.convertValue(scoreGoodsStyleDto, ScoreGoodsStyle.class);
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
index 8642998..5696fa7 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
@@ -33,6 +33,12 @@
@ApiModelProperty(value="商品详情")
private String details;
+ @ApiModelProperty(value="原价",required=true)
+ private String originalPrice;
+
+ @ApiModelProperty(value="现价",required=true)
+ private String presentPrice;
+
/**
* 是否抢购 1-是 2-否
*/
--
Gitblit v1.9.1