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 implements orders.setStatus(6); //开始服务 同时计算结束时间 OrdersMassage ordersMassage = ordersMassageService.getOne(new QueryWrapper().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();