Tenlion/system-ai-shop
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

项目更新,修改了沟通的BUG

Browse Source
This commit is contained in:
1215525055@qq.com 2025-06-03 16:40:08 +08:00
parent 1d2741f852
commit a171a4298a
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/com/tenlion/aishop/pojo/dtos/goods/GoodsSimpleDTO.java
View File

@ -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;

22
src/main/resources/mybatis/mapper/goodsonline/goodsonline-mapper.xml
View File

@ -15,6 +15,7 @@
<result column="goods_get_type" property="goodsGetType"/>
<result column="goods_description" property="goodsDescription"/>
<result column="goods_type" property="goodsType"/>
<result column="goods_type_name" property="goodsTypeName"/>
<result column="goods_open_price" property="goodsOpenPrice"/>
<result column="goods_price" property="goodsPrice"/>
<result column="goods_status_time" property="goodsStatusTime"/>
@ -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
</select>
@ -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