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 159cd56..c20d511 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 @@ -4200,11 +4200,13 @@ public class OrdersServiceImpl extends ServiceImpl implements for (OrdersMassage ordersMassage : ordersMassageList) { if(orders.getUserPackageDetailId() !=null){ UserPackageDetail userPackageDetail = userPackageDetailService.getById(ordersMassage.getMassageId()); - UserPackage userPackage = userPackageService.getById(userPackageDetail.getMainId()); - orders.setPackageType(userPackage.getType()); - userPackageDetail.setMainTitle(userPackage.getTitle()); - userPackageDetail.setMainPrice(userPackage.getPrice()); - ordersMassage.setUserPackageDetail(userPackageDetail); + if(userPackageDetail!=null){ + UserPackage userPackage = userPackageService.getById(userPackageDetail.getMainId()); + orders.setPackageType(userPackage.getType()); + userPackageDetail.setMainTitle(userPackage.getTitle()); + userPackageDetail.setMainPrice(userPackage.getPrice()); + ordersMassage.setUserPackageDetail(userPackageDetail); + } }else{ MassageType massageType = massageTypeService.getById(ordersMassage.getMassageId()); ordersMassage.setMassageType(massageType);