From 0f0601e5ebd5ad700146cac1adcace1e3215f928 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Sun, 26 Oct 2025 18:29:30 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=A0=B9=E6=8D=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=B1=BB=E5=9E=8B=E8=AE=BE=E7=BD=AE=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为类型3的订单设置商品名为"打印照片"
-为类型4的订单设置商品名为"一体机打印"
- 更新商品列表中的第一个商品名称以匹配订单商品名
---
 .../service/pc/impl/OrderServiceImpl.java     | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
index edf63bdb..3679c4f8 100644
--- a/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
+++ b/src/main/java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java
@@ -214,6 +214,39 @@ public class OrderServiceImpl implements OrderService {
             if (item.getScenicId() != null) {
                 item.setScenicName(scenicNames.get(item.getScenicId()));
             }
+            
+            if (Integer.valueOf(-1).equals(item.getType())) {
+                item.setGoodsName("一口价");
+                item.setOrderType("一口价");
+            } else if (Integer.valueOf(0).equals(item.getType())) {
+                // 单品，查询
+                OrderAppRespVO orderAppRespVO = orderMapper.appDetail(item.getId());
+                List<OrderItemVO> orderItemList = orderAppRespVO.getOrderItemList();
+                if (!orderItemList.isEmpty()) {
+                    if (Integer.valueOf(1).equals(orderItemList.getFirst().getGoodsType())) {
+                        item.setGoodsName("录像集");
+                        item.setOrderType("录像集");
+                    } else if (Integer.valueOf(2).equals(orderItemList.getFirst().getGoodsType())) {
+                        item.setGoodsName("照片集");
+                        item.setOrderType("照片集");
+                    } else if (Integer.valueOf(0).equals(orderItemList.getFirst().getGoodsType())) {
+                        item.setOrderType("旅行Vlog");
+                        item.setGoodsName(orderItemList.getFirst().getGoodsName());
+                    } else if (Integer.valueOf(4).equals(orderItemList.getFirst().getGoodsType())) {
+                        item.setGoodsName("一体机打印");
+                        item.setOrderType("一体机打印");
+                    } else {
+                        item.setGoodsName("未知商品");
+                        item.setOrderType("未知商品");
+                    }
+                }
+            } else if (Integer.valueOf(1).equals(item.getType())) {
+                item.setGoodsName("多项商品");
+                item.setOrderType("打包购买");
+            } else if (Integer.valueOf(3).equals(item.getType())) {
+                item.setGoodsName("打印照片");
+                item.setOrderType("照片打印");
+            }
         }
         PageInfo<OrderRespVO> pageInfo = new PageInfo<>(list);
         return ApiResponse.success(pageInfo);
@@ -237,6 +270,18 @@ public class OrderServiceImpl implements OrderService {
             if (item.getScenicId() != null) {
                 item.setScenicName(scenicNames.get(item.getScenicId()));
             }
+            if (Integer.valueOf(3).equals(item.getType())) {
+                item.setGoodsName("打印照片");
+                if (item.getOrderItemList() != null && !item.getOrderItemList().isEmpty()) {
+                    item.getOrderItemList().getFirst().setGoodsName(item.getGoodsName());
+                }
+            }
+            if (Integer.valueOf(4).equals(item.getType())) {
+                item.setGoodsName("一体机打印");
+                if (item.getOrderItemList() != null && !item.getOrderItemList().isEmpty()) {
+                    item.getOrderItemList().getFirst().setGoodsName(item.getGoodsName());
+                }
+            }
         }
         return ApiResponse.success(list);
     }