From accd7ae4c4ce514cb28afb94a54e83f212ec365e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 3 Jul 2024 13:47:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artificer/service/impl/OrdersServiceImpl.java        | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
index f67057a..f247bbe 100644
--- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
+++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
@@ -5405,7 +5405,14 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         orders.setStatus(6);
         //开始服务 同时计算结束时间
         OrdersMassage ordersMassage = ordersMassageService.getOne(new QueryWrapper<OrdersMassage>().eq("orders_id", orders.getOrdersId()));
-        MassageType massageType = massageTypeService.getById(ordersMassage.getMassageId());
+//        MassageType massageType = massageTypeService.getById(ordersMassage.getMassageId());
+        MassageType massageType = null;
+        if(orders.getUserPackageDetailId() !=null){
+            UserPackageDetail userPackageDetail = userPackageDetailService.getById(ordersMassage.getMassageId());
+            massageType = massageTypeService.getById(userPackageDetail.getMassageTypeId());
+        }else{
+            massageType = massageTypeService.getById(ordersMassage.getMassageId());
+        }
         int duration = massageType.getDuration();
         if (orders.getAddTime() != null) {
             duration = duration * ordersMassage.getNum() + orders.getAddTime();