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