From 4b055dac24f79dc6f6482728f6b650b40a6d9773 Mon Sep 17 00:00:00 2001 From: dzq Date: Wed, 16 Jul 2025 09:34:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E8=BF=98=E7=8A=B6=E6=80=81=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在OrderWithGoodsDTO中添加returnStatus字段用于标识订单退还状态 修改ShopOrderMapper查询语句，增加退还状态逻辑判断 --- .../com/agileboot/domain/shop/order/db/ShopOrderMapper.java | 3 ++- .../agileboot/domain/shop/order/db/dto/OrderWithGoodsDTO.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java index bed7754..a2bbf47 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/ShopOrderMapper.java @@ -22,7 +22,8 @@ public interface ShopOrderMapper extends BaseMapper { @Select("SELECT o.*, " + "GROUP_CONCAT(DISTINCT og.goods_name) AS goodsNames, " + - "GROUP_CONCAT(DISTINCT og.cover_img) AS coverImgs " + + "GROUP_CONCAT(DISTINCT og.cover_img) AS coverImgs, " + + "CASE WHEN o.status = 2 AND MAX(CASE WHEN og.status = 1 THEN 1 ELSE 0 END) = 1 THEN 0 ELSE 1 END AS returnStatus " + "FROM shop_order o " + "LEFT JOIN shop_order_goods og ON o.order_id = og.order_id AND og.deleted = 0 " + "LEFT JOIN cabinet_cell cc ON cc.cell_id = og.cell_id " + diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/dto/OrderWithGoodsDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/dto/OrderWithGoodsDTO.java index e0099fd..05207a3 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/dto/OrderWithGoodsDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/db/dto/OrderWithGoodsDTO.java @@ -9,4 +9,6 @@ import lombok.EqualsAndHashCode; public class OrderWithGoodsDTO extends ShopOrderEntity { private String goodsNames; private String coverImgs; + // 0未退还 1已退还 + private Integer returnStatus; } \ No newline at end of file