From 84d42b6997ae87fa64b75ae085fce11d05a6ca5a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 12 Oct 2025 02:17:49 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
index 2d398ab..c7e9d4a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java
@@ -115,6 +115,7 @@
List<UserPolicy> list = userPolicyService.list(new LambdaQueryWrapper<UserPolicy>()
.eq(UserPolicy::getUserId, userAccount.getId())
.eq(UserPolicy::getPayStatus,2)
+ .eq(UserPolicy::getApprovalStatus,1)
);
return Result.success(list);
}catch (Exception e){
@@ -161,15 +162,19 @@
/**
- * 保单列表
+ * 支付记录列表
*/
@GetMapping("/PaymentRecordList")
- public TableDataInfo PaymentRecordList(@RequestParam(value = "payOrdeNo",required = false) String payOrdeNo,
+ public TableDataInfo PaymentRecordList( @RequestParam(value = "account",required = false) String account,
+ @RequestParam(value = "payOrdeNo",required = false) String payOrdeNo,
@RequestParam(value = "paymentStatus",required = false) Integer paymentStatus) {
startPage();
LambdaQueryWrapper<PaymentRecord> wrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotEmpty(account)) {
+ wrapper.eq(PaymentRecord::getAccount, account);
+ }
// 产品名称模糊查询
if (StringUtils.isNotEmpty(payOrdeNo)) {
wrapper.eq(PaymentRecord::getPayOrdeNo, payOrdeNo);
@@ -226,7 +231,7 @@
userPolicy.setApprovalStatus(approvalStatus);
userPolicy.setMessage(message);
userPolicy.setStartDate(LocalDate.now());
- userPolicy.setEndDate(expirationTime);
+ userPolicy.setEndDate(expirationTime.minusDays(1));
userPolicy.setInsuranceBenefitExpiryDate(insuranceBenefitExpiryDate);
userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.ACTIVE);
userPolicy.setUpdatedAt(new Date());
@@ -514,4 +519,31 @@
throw new RuntimeException("MD5加密失败", e);
}
}
+
+ /**
+ * 保单列表
+ */
+ @GetMapping("/deleteRecordById")
+ public AjaxResult PaymentRecordList(@RequestParam(value = "id",required = false) Integer id) {
+ // 查询所有创建时间超过5分钟且状态为待支付的订单
+ PaymentRecord byId = paymentRecordService.getById(id);
+ if(ObjectUtil.isEmpty(byId)){
+ return AjaxResult.error("订单不存在！");
+ }
+ if(byId.getPaymentStatus() == 2){
+ return AjaxResult.error("订单已支付，禁止删除");
+ }
+ UserPolicy userPolicy = userPolicyService.getById(byId.getOrderId());
+ if(ObjectUtil.isEmpty(userPolicy)){
+ return AjaxResult.error("保单不存在！");
+ }
+ if(userPolicy.getPayStatus() == 2){
+ return AjaxResult.error("订单已支付，禁止删除");
+ }
+
+ paymentRecordService.removeById(byId);
+ userPolicyService.removeById(userPolicy);
+ return AjaxResult.success("删除成功");
+ }
+
}
--
Gitblit v1.9.3