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("当前订单没有选择服务项目!"); }