服务包详情

src/main/java/com/sqx/modules/bl/order/app/AppUserPackageDetailController.java

@@ -27,10 +27,10 @@ public class AppUserPackageDetailController {
         return service.findAppUsedQuantity(userPackageDetail);
     }
 
-//    @Login
+    @Login
-//    @GetMapping("/getMyPackageDetail")
+    @GetMapping("/getMyPackageDetail")
-//    @ApiOperation("查询服务包详情")
+    @ApiOperation("查询服务包详情")
-//    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
+    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
-//        return service.getMyPackageDetail(userPackageDetail);
+        return service.getMyPackageDetail(userPackageDetail);
-//    }
+    }
 }

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;
 

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);
 }

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);
 }

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
+    @Override
-//    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
+    public Result getMyPackageDetail(UserPackageDetail userPackageDetail){
-//        if(userPackageDetail.getId()!=null){
+        if(userPackageDetail.getId()!=null){
-//            userPackageDetail = baseMapper.getMyPackageDetail(userPackageDetail.getId());
+            userPackageDetail = baseMapper.getMyPackageDetail(userPackageDetail.getId());
-//        }
+        }else{
-//
+            userPackageDetail = baseMapper.getMyPackageDetailNoId(userPackageDetail.getMainId(),userPackageDetail.getMassageTypeId());
-//        Map<String, Object> map = new HashMap<String, Object>();
+        }
-//        UserPackage userPackage = userPackageService.getMyPackageById(userPackageDetail.getMainId());
+        return Result.success().put("data",userPackageDetail);
-//        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);
-//    }
 
 
 

src/main/resources/mapper/bl/order/UserPackageDetailDao.xml

@@ -160,9 +160,43 @@
             a.parent_id,
             a.classify_id,
             a.apply_people,
-            a.jianjie
+            a.jianjie,
-        from bl_user_package_detail a left join massage_type b on a.massage_type_id = b.massage_type_id
+            m.sales
-        where main_id = #{mainId}
+        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>