From c7af021f861a74318ecbca51a7c3e04c8759153b Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 7 Aug 2024 15:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artificer/service/impl/OrdersServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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);