From bb9b35fb7a49b93957c19910aef5a10664ae3f37 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Mon, 15 Dec 2025 10:08:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=A2=E5=8D=95):=20=E4=B8=BA=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F3=E8=AE=A2=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=A0=BC?=
 =?UTF-8?q?=E5=8F=A3=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E5=92=8C=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在订单模式3下，商品名称现在显示为"柜子名称+格口号"
退货审核通知根据订单模式区分显示"退还格口"或"退还商品"
---
 .../shop/approval/ReturnApprovalApplicationService.java     | 6 +++++-
 .../domain/shop/order/OrderApplicationService.java          | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java
index 875ab48..abe8a93 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/ReturnApprovalApplicationService.java
@@ -861,7 +861,11 @@ public class ReturnApprovalApplicationService {
             List<NewsArticle> articles = new ArrayList<>();
             NewsArticle article = new NewsArticle();
             article.setTitle("退货审核通知");
-            article.setDescription("退还商品：" + orderGoods.getGoodsName());
+            if (orderGoods.getMode() != null && orderGoods.getMode().equals(3)) {
+                article.setDescription("退还格口：" + orderGoods.getGoodsName());
+            } else {
+                article.setDescription("退还商品：" + orderGoods.getGoodsName());
+            }
             article.setPicurl(orderGoods.getCoverImg());
             String serverHost = CacheCenter.configCache.get(ConfigKeyEnum.SERVER_HOST.getValue());
             article.setUrl(serverHost + UrlConstants.WECHAT_AUTH_URL + "?corpid=" + command.getCorpid());
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java
index 26278b4..04b417a 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/order/OrderApplicationService.java
@@ -403,10 +403,12 @@ public class OrderApplicationService {
             goodsModel.setDeleted(false);
 
             CabinetCellEntity cabinetCellEntity = cabinetCellService.getById(goodsModel.getCellId());
+            SmartCabinetEntity cabinetEntity = smartCabinetService.getById(cabinetCellEntity.getCabinetId());
 
             if (orderModel.getMode() != null && orderModel.getMode().equals(3)) {
                 goodsModel.setPrice(cabinetCellEntity.getCellPrice());
                 goodsModel.setTotalAmount(cabinetCellEntity.getCellPrice());
+                goodsModel.setGoodsName(cabinetEntity.getCabinetName() + "格口" + cabinetCellEntity.getCellNo());
             } else {
                 // 计算商品金额并验证库存
                 goodsModel.calculateTotal();