From 8ffeaeaec6a0173a5bd3a8f6a51799e8cbae9070 Mon Sep 17 00:00:00 2001 From: "1215525055@qq.com" <1215525055@qq.com> Date: Fri, 7 Mar 2025 15:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E5=85=B3=E8=81=94=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/packageorder/IPackageOrderService.java | 2 +- .../service/packageorder/impl/PackageOrderServiceImpl.java | 7 ++++--- .../mybatis/mapper/packageorder/package-order-mapper.xml | 5 ++++- 3 files changed, 9 insertions(+), 5 deletions(-) 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