From 6ef710201c1246beaf22a1318a7220b9e60343da Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Fri, 21 Nov 2025 10:03:10 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=20=E4=BF=AE=E6=AD=A3=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=95=86=E5=93=81=E5=90=8D=E7=A7=B0=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E8=B4=AD=E4=B9=B0=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改AppPuzzleController中isBuy方法的参数传递逻辑
- 在OrderServiceImpl中为未知类型添加默认商品名称
- 统一景区相关商品的命名规则
---
 .../com/ycwl/basic/controller/mobile/AppPuzzleController.java   | 2 +-
 .../java/com/ycwl/basic/service/pc/impl/OrderServiceImpl.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java
index eb13a13a..7c2e3883 100644
--- a/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java
+++ b/src/main/java/com/ycwl/basic/controller/mobile/AppPuzzleController.java
@@ -205,7 +205,7 @@ public class AppPuzzleController {
 
         // 设置模板ID
         vo.setTemplateId(record.getTemplateId());
-        IsBuyRespVO isBuyRespVO = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), 3, face.getId());
+        IsBuyRespVO isBuyRespVO = orderBiz.isBuy(face.getMemberId(), face.getScenicId(), 5, record.getTemplateId());
         if (isBuyRespVO.isBuy()) {
             vo.setIsBuy(1);
         } else {
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 ff137178..68fbdd0b 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
@@ -447,6 +447,8 @@ public class OrderServiceImpl implements OrderService {
                 goodsName = "景区录像包";
             } else if (type == 2) {
                 goodsName = "景区照片包";
+            } else {
+                goodsName = "景区售卖物品";
             }
         }
         wxPayOrderReqVO.setOpenId(order.getOpenId())