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 | 89 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 82 insertions(+), 7 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 09d15b3..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
@@ -20,8 +20,10 @@
import com.ruoyi.system.domain.dto.PayCallbackDTO;
import com.ruoyi.system.domain.dto.UserPolicyDto;
import com.ruoyi.im.service.UserPolicyService;
+import com.ruoyi.system.service.PaymentRecordService;
import com.ruoyi.system.service.UserAccountService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.catalina.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
@@ -62,8 +64,9 @@
@Autowired
InsuranceProductService insuranceProductService;
+
@Autowired
- private PayService payService;
+ PaymentRecordService paymentRecordService;
@Value("${pay.key}")
private String key;
@@ -112,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){
@@ -158,6 +162,34 @@
/**
+ * 支付记录列表
+ */
+ @GetMapping("/PaymentRecordList")
+ 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);
+ }
+ if (paymentStatus != null) {
+ wrapper.eq(PaymentRecord::getPaymentStatus, paymentStatus);
+ }
+ // 按创建时间倒序排列
+ wrapper.orderByDesc(PaymentRecord::getCreateTime);
+
+ List<PaymentRecord> list = paymentRecordService.list(wrapper);
+ return getDataTable(list);
+ }
+
+ /**
* 保单审批
*/
@GetMapping("/examine")
@@ -192,12 +224,15 @@
}
//计算到期时间
- LocalDate expirationTime = calculateInsuranceEndDateToDay(LocalDate.now(), userPolicy.getTerm());
+ LocalDate expirationTime = calculateInsuranceEndDate(LocalDate.now(), userPolicy.getTerm());
+ //保险金领取到期时间
+ LocalDate insuranceBenefitExpiryDate = calculateInsuranceEndDateToDay(LocalDate.now(), userPolicy.getNumberDays());
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());
userPolicyService.updateById(userPolicy);
@@ -205,7 +240,7 @@
//每天可领
BigDecimal amountClaimed = userPolicy.getCoverageAmount()
- .divide(new BigDecimal(userPolicy.getTerm()), 4, RoundingMode.HALF_UP);
+ .divide(new BigDecimal(userPolicy.getNumberDays()), 4, RoundingMode.HALF_UP);
MedicalInsuranceAccount medicalInsuranceAccount = new MedicalInsuranceAccount();
medicalInsuranceAccount.setUserId(userPolicy.getUserId());
@@ -217,6 +252,7 @@
medicalInsuranceAccount.setAlreadyReceived(BigDecimal.ZERO);
medicalInsuranceAccount.setAmountAlreadyUsed(BigDecimal.ZERO);
medicalInsuranceAccount.setEffectiveDate(userPolicy.getStartDate());
+ medicalInsuranceAccount.setInsuranceBenefitExpiryDate(userPolicy.getInsuranceBenefitExpiryDate());
medicalInsuranceAccount.setExpiryDate(userPolicy.getEndDate());
medicalInsuranceAccount.setAccountStatus(MedicalInsuranceAccount.AccountStatus.ACTIVE);
medicalInsuranceAccount.setCreatedAt(new Date());
@@ -273,7 +309,7 @@
}
/**
- * 计算保险到期日
+ * 计算保险到期日按天
* @param startDate 保险开始日期
* @param termDays 保险天数
* @return 保险到期日期
@@ -427,7 +463,13 @@
userPolicy.setUpdatedAt(new Date());
boolean updateResult = userPolicyService.updateById(userPolicy);
-
+ PaymentRecord paymentRecord = paymentRecordService.getOne(new LambdaQueryWrapper<PaymentRecord>()
+ .eq(PaymentRecord::getPayOrdeNo, callbackDTO.getOrderId())
+ );
+ if(ObjectUtil.isNotEmpty(paymentRecord)){
+ paymentRecord.setPaymentStatus(PaymentRecord.PaymentStatus.PAID.getCode());
+ paymentRecordService.updateById(paymentRecord);
+ }
if (updateResult) {
log.info("支付成功处理完成: {}", callbackDTO.getOrderId());
return true;
@@ -443,7 +485,13 @@
userPolicy.setUpdatedAt(new Date());
boolean updateResult = userPolicyService.updateById(userPolicy);
-
+ PaymentRecord paymentRecord = paymentRecordService.getOne(new LambdaQueryWrapper<PaymentRecord>()
+ .eq(PaymentRecord::getPayOrdeNo, callbackDTO.getOrderId())
+ );
+ if(ObjectUtil.isNotEmpty(paymentRecord)){
+ paymentRecord.setPaymentStatus(PaymentRecord.PaymentStatus.EXPIRED.getCode());
+ paymentRecordService.updateById(paymentRecord);
+ }
if (updateResult) {
log.info("支付超时处理完成: {}", callbackDTO.getOrderId());
return true;
@@ -471,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