From a171a4298a0356f722683153937d16dfd5dba82f Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Tue, 3 Jun 2025 16:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9B=B4=E6=96=B0,=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=B2=9F=E9=80=9A=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/dtos/goods/GoodsSimpleDTO.java | 10 +++++++++ .../mapper/goodsonline/goodsonline-mapper.xml | 22 ++++++++++++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java index c46c830..3ff9ef4 100644 --- a/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java +++ b/src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java @@ -40,6 +40,8 @@ public class GoodsSimpleDTO { private String goodsDescription; @ApiModelProperty(name = "goodsType", value = "软著平台类型") private String goodsType; + @ApiModelProperty(name = "goodsTypeName", value = "软著平台类型名称") + private String goodsTypeName; @ApiModelProperty(name = "goodsOpenPrice", value = "软著挂牌价格") private Double goodsOpenPrice; @ApiModelProperty(name = "goodsPrice", value = "软著出售价格") @@ -55,6 +57,14 @@ public class GoodsSimpleDTO { @ApiModelProperty(name = "goodsFlag", value = "商品标签") private String goodsFlag; + public String getGoodsTypeName() { + return goodsTypeName == null ? "" : goodsTypeName.trim(); + } + + public void setGoodsTypeName(String goodsTypeName) { + this.goodsTypeName = goodsTypeName; + } + public Long getGoodsLastDay() { long lastDay = ShopDateUtils.calculateDaysDifference(goodsLastTime); return lastDay; diff --git a/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml b/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml index fa6a3a4..e68d3d8 100644 --- a/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml +++ b/src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml @@ -15,6 +15,7 @@ + @@ -141,9 +142,14 @@ t1.goods_last_time, t1.goods_status_time, t1.goods_vnumber, - t1.goodsonline_id + t1.goodsonline_id, + t2.data_name AS goods_type_name FROM shop_goodsonline t1 + LEFT JOIN + data_data t2 + ON + t1.goods_type = t2.data_id WHERE t1.is_delete = 0 AND t1.goods_id = #{goodsId} AND t1.goods_vnumber = #{goodsVnumber} AND t1.goods_status = 1 AND t1.goods_check_status = 2 @@ -166,9 +172,14 @@ t1.goods_last_time, t1.goods_status_time, t1.goods_vnumber, - t1.goodsonline_id + t1.goodsonline_id, + t2.data_name AS goods_type_name FROM shop_goodsonline t1 + LEFT JOIN + data_data t2 + ON + t1.goods_type = t2.data_id WHERE t1.is_delete = 0 AND t1.goods_id = #{goodsId} AND t1.goods_status = 1 AND t1.goods_check_status = 2 /* AND DATE(t1.goods_last_time) > CURDATE() AND NOT EXISTS (SELECT 1 FROM shop_order t2 WHERE t2.order_status != 0 AND t2.goods_id = t1.goods_id)*/ ORDER BY @@ -195,9 +206,14 @@ t1.goods_status_time, t1.goods_vnumber, t1.goodsonline_id, - t3.goods_flag + t3.goods_flag, + t2.data_name AS goods_type_name FROM shop_goodsonline t1 + LEFT JOIN + data_data t2 + ON + t1.goods_type = t2.data_id INNER JOIN ( SELECT t2.goods_id, MAX(t2.goods_vnumber) AS v FROM shop_goodsonline t2 WHERE t2.is_delete = 0 AND t2.goods_status = 1 AND t2.goods_check_status = 2 GROUP BY t2.goods_id