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 { 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 { 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 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 - - \ No newline at end of file