From 5d6ef5bd46e34321ffe9d7e222a60c7f38b9a8bf Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Wed, 5 Mar 2025 17:37:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E9=94=99=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 --- .../packageorder/PackageOrderResourceController.java | 1 + .../service/packageorder/impl/PackageOrderServiceImpl.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java b/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java index 11e5b44..95b2339 100644 --- a/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java +++ b/src/main/java/cn/com/tenlion/operator/controller/resource/packageorder/PackageOrderResourceController.java @@ -138,6 +138,7 @@ public class PackageOrderResourceController extends DefaultBaseController { Map params = requestParams(); params.put("userId", userId); params.put("packagePayStatus", "1"); + params.put("toResource", "对外提供查询info信息"); page.setParams(params); return packageOrderService.listPage(page); } diff --git a/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java index 705112c..2a15e4c 100644 --- a/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java @@ -37,6 +37,7 @@ import cn.com.tenlion.operator.service.packageorder.IPackageOrderService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -276,8 +277,10 @@ public class PackageOrderServiceImpl extends DefaultBaseService implements IPack List list = packageOrderDao.list(params); if(params.get("toResource") != null) { for(PackageOrderDTO dto : list) { - PackageInfoAppDTO dto1 = iPackageInfoService.getById(dto.getPackageInfoId()); - dto.setPackageInfoAppDTO(dto1); + PackageInfoDTO dto1 = iPackageInfoService.get(dto.getPackageInfoId()); + PackageInfoAppDTO dto2 = new PackageInfoAppDTO(); + BeanUtils.copyProperties(dto1, dto2); + dto.setPackageInfoAppDTO(dto2); } } return list;