From ec23be6c892fe7a9b180102b52425c99ee22ec2b 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 21:05:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=BE=85=E8=A1=A5=E5=8D=95?= =?UTF-8?q?=E4=B8=8B=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/artificer/service/impl/OrdersServiceImpl.java | 7 ++++++- 1 file changed, 6 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 4f38d5d..6b5b945 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 @@ -935,7 +935,12 @@ public class OrdersServiceImpl extends ServiceImpl implements Long massageTypeId; if (orders.getOrdersMassageList() != null) { List ordersMassageList = orders.getOrdersMassageList(); - massageTypeId = ordersMassageList.get(0).getMassageId(); + if(orders.getUserPackageDetailId() != null) { + UserPackageDetail userPackageDetail = userPackageDetailService.getById(ordersMassageList.get(0).getMassageId()); + massageTypeId = userPackageDetail.getMassageTypeId(); + }else{ + massageTypeId = ordersMassageList.get(0).getMassageId(); + } } else { return Result.error("当前订单没有选择服务项目！"); }