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