From 1cf34bf75b4b6b091f0aea3d7f97f1c689e40fe5 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 13 Oct 2025 01:42:19 +0800
Subject: [PATCH] 1
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
index bc0dc43..30859d4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/ImApiController.java
@@ -404,7 +404,7 @@
long count = userPolicyService.count(new LambdaQueryWrapper<>(UserPolicy.class)
.eq(UserPolicy::getUserId, userAccount.getId())
.eq(UserPolicy::getProductId,f.getId())
- .and(a->a.ne(UserPolicy::getPayStatus,2).or().ne(UserPolicy::getPayStatus,1))
+ .eq(UserPolicy::getPayStatus,2)
.ne(UserPolicy::getApprovalStatus,2)
);
if(count > 0){
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java b/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java
index 13f487b..fc6329c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/task/MedicalInsuranceTask.java
@@ -128,10 +128,10 @@
List<PaymentRecord> records = paymentRecordService.list(new LambdaQueryWrapper<PaymentRecord>()
.in(PaymentRecord::getOrderId, ids)
);
- userPolicyService.removeByIds(records);
+ paymentRecordService.removeByIds(records);
}
if(!CollectionUtils.isEmpty(list)){
- paymentRecordService.removeByIds(list);
+ userPolicyService.removeByIds(list);
}
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java
index c8debd5..385b2fc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPolicy.java
@@ -97,7 +97,7 @@
//支付订单号
private String orderNo;
- //支付失败原因
+ //支付失败原因getProduct
private String payMsg;
//支付方式 1 支付宝 2微信 3余额
--
Gitblit v1.9.3