From b01459e8b2341ac3af3589eb93b5d22817fd5753 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Sat, 15 Jun 2024 20:56:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8C=85=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppUserPackageDetailController.java   | 12 +++---
 .../bl/order/entity/UserPackageDetail.java    |  6 +++
 .../service/UserPackageDetailService.java     |  1 +
 .../bl/order/service/UserPackageService.java  |  2 +-
 .../impl/UserPackageDetailServiceImpl.java    | 32 +++++----------
 .../mapper/bl/order/UserPackageDetailDao.xml  | 40 +++++++++++++++++--
 6 files changed, 61 insertions(+), 32 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 e0ba9a3..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
@@ -27,10 +27,10 @@ public class AppUserPackageDetailController {
         return service.findAppUsedQuantity(userPackageDetail);
     }
 
-//    @Login
-//    @GetMapping("/getMyPackageDetail")
-//    @ApiOperation("查询服务包详情")
-//    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
-//        return service.getMyPackageDetail(userPackageDetail);
-//    }
+    @Login
+    @GetMapping("/getMyPackageDetail")
+    @ApiOperation("查询服务包详情")
+    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
+        return service.getMyPackageDetail(userPackageDetail);
+    }
 }
diff --git a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java
index 2d3e83c..5be285f 100644
--- a/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java
+++ b/src/main/java/com/sqx/modules/bl/order/entity/UserPackageDetail.java
@@ -158,6 +158,12 @@ public class UserPackageDetail implements Serializable {
     @TableField(exist = false)
     private Integer unUsedQuantity;
 
+    /**
+     * 销量
+     */
+    @TableField(exist = false)
+    private Integer sales;
+
     @TableField(exist = false)
     private Integer page;
 
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 ca6b983..4bd428f 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
@@ -11,4 +11,5 @@ public interface UserPackageDetailService extends IService<UserPackageDetail> {
     List<UserPackageDetail> findMassagePackageDetails(UserPackageDetail userPackageDetail);
     int insert(UserPackageDetail userPackageDetail);
     Result findAppUsedQuantity(UserPackageDetail userPackageDetail);
+    Result getMyPackageDetail(UserPackageDetail userPackageDetail);
 }
diff --git a/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java b/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java
index d36efaf..9d3d2a0 100644
--- a/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java
+++ b/src/main/java/com/sqx/modules/bl/order/service/UserPackageService.java
@@ -14,5 +14,5 @@ public interface UserPackageService extends IService<UserPackage> {
 
     Result findMyPackageList(UserPackage userPackage);
 
-//    UserPackage getMyPackageById(Long id);
+    UserPackage getMyPackageById(Long id);
 }
\ No newline at end of file
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 b8f4299..4b8e096 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
@@ -60,28 +60,16 @@ public class UserPackageDetailServiceImpl extends ServiceImpl<UserPackageDetailD
         map.put("detailData",list);
         return Result.success().put("data",map);
     }
-//
-//    @Override
-//    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
-//        if(userPackageDetail.getId()!=null){
-//            userPackageDetail = baseMapper.getMyPackageDetail(userPackageDetail.getId());
-//        }
-//
-//        Map<String, Object> map = new HashMap<String, Object>();
-//        UserPackage userPackage = userPackageService.getMyPackageById(userPackageDetail.getMainId());
-//        map.put("mainData",userPackage);
-//        int type = userPackage.getType();
-//        List<UserPackageDetail> list = Lists.newArrayList();
-//        if(type == 104){
-//            list = baseMapper.findDetailList(userPackageDetail);
-//        }else if(type == 105){
-//            list = baseMapper.findDetailUsedQuantity(userPackageDetail);
-//        }else if(type == 106){
-//            list = baseMapper.findLcDetailUsedQuantity(userPackageDetail);
-//        }
-//        map.put("detailData",list);
-//        return Result.success().put("data",map);
-//    }
+
+    @Override
+    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
+        if(userPackageDetail.getId()!=null){
+            userPackageDetail = baseMapper.getMyPackageDetail(userPackageDetail.getId());
+        }else{
+            userPackageDetail = baseMapper.getMyPackageDetailNoId(userPackageDetail.getMainId(),userPackageDetail.getMassageTypeId());
+        }
+        return Result.success().put("data",userPackageDetail);
+    }
 
 
 
diff --git a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml
index cd038e6..f157e48 100644
--- a/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml
+++ b/src/main/resources/mapper/bl/order/UserPackageDetailDao.xml
@@ -160,9 +160,43 @@
             a.parent_id,
             a.classify_id,
             a.apply_people,
-            a.jianjie
-        from bl_user_package_detail a left join massage_type b on a.massage_type_id = b.massage_type_id
-        where main_id = #{mainId}
+            a.jianjie,
+            m.sales
+        from bl_user_package_detail a left join massage_type m on a.massage_type_id = m.massage_type_id
+        where a.id = #{id}
+    </select>
+
+    <select id="getMyPackageDetailNoId" 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,
+            m.sales
+        from bl_user_package_detail a
+        left join massage_type m on a.massage_type_id = m.massage_type_id
+        where a.main_id = #{mainId}
+        and a.massage_type_id = #{massageTypeId}
+        and a.status = 0
+        limit 1
     </select>