diff --git a/src/main/java/cn/com/tenlion/operator/service/packageorder/IPackageOrderService.java b/src/main/java/cn/com/tenlion/operator/service/packageorder/IPackageOrderService.java index 3d99fd5..d4b7280 100644 --- a/src/main/java/cn/com/tenlion/operator/service/packageorder/IPackageOrderService.java +++ b/src/main/java/cn/com/tenlion/operator/service/packageorder/IPackageOrderService.java @@ -179,7 +179,7 @@ public interface IPackageOrderService { */ SuccessResultList> listPage(ListPage page); - List list(String packageInfoId, String userId); + List listByUserAndInfo(String packageInfoId, String userId); /** * 套餐包-订单统计 diff --git a/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java index 21ac3c1..fe16ea1 100644 --- a/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java +++ b/src/main/java/cn/com/tenlion/operator/service/packageorder/impl/PackageOrderServiceImpl.java @@ -176,9 +176,10 @@ public class PackageOrderServiceImpl extends DefaultBaseService implements IPack } @Override - public List list(String packageInfoId, String userId) { + public List listByUserAndInfo(String packageInfoId, String userId) { Map params = super.getHashMap(2); params.put("packageInfoId", packageInfoId); + params.put("notCheckStatus", "不校验删除状态"); params.put("userId", userId); return packageOrderDao.list(params); } @@ -200,7 +201,7 @@ public class PackageOrderServiceImpl extends DefaultBaseService implements IPack PackageInfoAppDTO infoAppDTO = orderDTO.getPackageInfoAppDTO(); // 仅限购买1次的 if(infoAppDTO.getPackageMode().equals("single")) { - List list = list(orderDTO.getPackageInfoId(), orderDTO.getCreator()); + List list = listByUserAndInfo(orderDTO.getPackageInfoId(), orderDTO.getCreator()); Boolean exists = false; for(PackageOrderDTO dto : list) { if(dto.getPackagePayStatus().equals("1")) { @@ -232,7 +233,7 @@ public class PackageOrderServiceImpl extends DefaultBaseService implements IPack PackageInfoAppDTO infoAppDTO = orderDTO.getPackageInfoAppDTO(); // 仅限购买1次的 if(infoAppDTO.getPackageMode().equals("single")) { - List list = list(orderDTO.getPackageInfoId(), orderDTO.getCreator()); + List list = listByUserAndInfo(orderDTO.getPackageInfoId(), orderDTO.getCreator()); Boolean exists = false; for(PackageOrderDTO dto : list) { if(dto.getPackagePayStatus().equals("1")) { diff --git a/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml b/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml index 122359b..6439661 100644 --- a/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml +++ b/src/main/resources/mybatis/mapper/packageorder/package-order-mapper.xml @@ -301,7 +301,10 @@ ON t1.package_info_id = t4.package_info_id WHERE - t1.is_delete = 0 + 1 = 1 + + AND t1.is_delete = 0 + AND t1.package_total_surplus_count > 0