From 380ce8ee62cfd14b8212f719d236107b272eaf88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 25 Jul 2024 15:50:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E7=A7=92=E6=9D=80=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=A2=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/MassagePackageServiceImpl.java        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java b/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java
index 94edd6d..ed24626 100644
--- a/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/massage/service/impl/MassagePackageServiceImpl.java
@@ -10,6 +10,7 @@ import com.sqx.modules.app.service.UserService;
 import com.sqx.modules.bl.collect.entity.CollectMassage;
 import com.sqx.modules.bl.collect.service.CollectMassageService;
 import com.sqx.modules.bl.massage.dao.MassagePackageDao;
+import com.sqx.modules.bl.massage.dao.MassagePackageDetailDao;
 import com.sqx.modules.bl.massage.entity.MassagePackage;
 import com.sqx.modules.bl.massage.entity.MassagePackageDetail;
 import com.sqx.modules.bl.massage.service.MassagePackageService;
@@ -35,6 +36,9 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
     @Autowired
     private UserService userService;
 
+    @Autowired
+    MassagePackageDetailDao massagePackageDetailDao;
+
     @Override
     public Result findPage(MassagePackage massagePackage){
         Page<MassagePackage> pages=new Page<>(massagePackage.getPage(),massagePackage.getLimit());
@@ -138,6 +142,11 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
         entity.setBuyGroupNum(userMap.size());
         map.put("groupData",entity);
         map.put("ordersData",groupNoList);
+        Page<MassagePackageDetail> pages=new Page<>(1,1);
+        MassagePackageDetail massagePackageDetail = new MassagePackageDetail();
+        massagePackageDetail.setMainId(massagePackage.getId());
+        massagePackageDetail.setStatus(1);
+        map.put("detailData",new PageUtils(massagePackageDetailDao.findPage(pages,massagePackageDetail)));
         return Result.success(map);
     }
 
@@ -148,6 +157,7 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
      */
     @Override
     public Result getAppFlashDetail(Long userId,MassagePackage massagePackage){
+        Map<String, Object> map = new HashMap<String, Object>();
         //插入浏览历史
         CollectMassage collectMassage=new CollectMassage();
         collectMassage.setClassify(2);
@@ -156,7 +166,13 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
         collectMassage.setFlag(4);
         collectMassageService.insertCollect(collectMassage);
         MassagePackage entity = baseMapper.getAppActivityDetail(massagePackage.getId());
-        return Result.success().put("data",entity);
+        map.put("data",entity);
+        Page<MassagePackageDetail> pages=new Page<>(1,1);
+        MassagePackageDetail massagePackageDetail = new MassagePackageDetail();
+        massagePackageDetail.setMainId(massagePackage.getId());
+        massagePackageDetail.setStatus(1);
+        map.put("detailData",new PageUtils(massagePackageDetailDao.findPage(pages,massagePackageDetail)));
+        return Result.success(map);
     }
 
 }
\ No newline at end of file