From ac61ef1dc1ac5787aebcce1bf5f4009df0f07179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 22 Jul 2024 10:58:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E6=97=B6=E7=A7=92=E6=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppUserPackageDetailController.java   |  8 -----
 .../bl/order/dao/UserPackageDetailDao.java    |  2 --
 .../service/UserPackageDetailService.java     |  1 -
 .../impl/UserPackageDetailServiceImpl.java    | 13 ++------
 .../mapper/bl/order/UserPackageDetailDao.xml  | 33 -------------------
 5 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java
index 15d2da1..e43e4d2 100644
--- a/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java
+++ b/src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java
@@ -33,12 +33,4 @@ public class AppUserPackageDetailController {
     public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
         return service.getMyPackageDetail(userPackageDetail);
     }
-
-    @Login
-    @GetMapping("/findMyFlashDetail")
-    @ApiOperation("查询限时秒杀详情列表")
-    public Result findMyFlashDetail(Long id){
-        return service.findMyFlashDetail(id);
-    }
-
 }
diff --git a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java
index 9b2acc3..54da8eb 100644
--- a/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java
+++ b/src/main/java/com/sqx/modules/bl/order/dao/UserPackageDetailDao.java
@@ -27,6 +27,4 @@ public interface UserPackageDetailDao extends BaseMapper<UserPackageDetail> {
 
     int deleteDetailByMain(Long mainId);
 
-    UserPackageDetail findMyFlashDetail(Long id);
-
 }
\ No newline at end of file
diff --git a/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java b/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java
index 35ea3ab..c1d8b95 100644
--- a/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java
+++ b/src/main/java/com/sqx/modules/bl/order/service/UserPackageDetailService.java
@@ -14,5 +14,4 @@ public interface UserPackageDetailService extends IService<UserPackageDetail> {
     Result getMyPackageDetail(UserPackageDetail userPackageDetail);
     UserPackageDetail findMassagePackageDetailsUsed(Long mainId);
     int deleteDetailByMain(Long mainId);
-    Result findMyFlashDetail(Long id);
 }
diff --git a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java
index b5db42e..39d82d3 100644
--- a/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java
+++ b/src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java
@@ -49,12 +49,12 @@ public class UserPackageDetailServiceImpl extends ServiceImpl<UserPackageDetailD
         UserPackage userPackage = userPackageService.getMyPackageById(userPackageDetail.getMainId());
         int type = userPackage.getType();
         List<UserPackageDetail> list = Lists.newArrayList();
-        if(type == 104){
-            list = baseMapper.findDetailList(userPackageDetail);
-        }else if(type == 105){
+        if(type == 105){
             list = baseMapper.findDetailUsedQuantity(userPackageDetail);
         }else if(type == 106){
             list = baseMapper.findLcDetailUsedQuantity(userPackageDetail);
+        }else{
+            list = baseMapper.findDetailList(userPackageDetail);
         }
         map.put("mainData",userPackage);
         map.put("detailData",list);
@@ -81,11 +81,4 @@ public class UserPackageDetailServiceImpl extends ServiceImpl<UserPackageDetailD
         return baseMapper.deleteDetailByMain(mainId);
     }
 
-    @Override
-    public Result findMyFlashDetail(Long id){
-        UserPackageDetail userPackageDetail = baseMapper.findMyFlashDetail(id);
-        return Result.success().put("data",userPackageDetail);
-
-    }
-
 }
\ No newline at end of file
diff --git a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml
index de1205c..5f966d9 100644
--- a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml
+++ b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml
@@ -223,37 +223,4 @@
         WHERE main_id = #{mainId}
     </update>
 
-    <select id="findMyFlashDetail" resultType="com.sqx.modules.bl.order.entity.UserPackageDetail">
-        select
-            a.id,
-            a.main_id,
-            a.package_detail_id,
-            a.massage_type_id,
-            a.status,
-            a.package_price,
-            a.interval_days,
-            a.create_time,
-            a.title,
-            a.massage_img,
-            a.content,
-            a.old_price,
-            a.price,
-            a.duration,
-            a.is_sex,
-            a.city,
-            a.content_img,
-            a.labels,
-            a.parent_id,
-            a.classify_id,
-            a.apply_people,
-            a.jianjie,
-            a.level,
-            m.sales
-        from bl_user_package_detail a
-        inner join bl_user_package b on a.main_id = b.id
-        left join massage_type m on a.massage_type_id = m.massage_type_id
-        where b.id = #{id}
-        limit 1
-    </select>
-
 </mapper>
\ No newline at end of file