From 2c7b7986f347961adec433e378a1f82434c7150e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sat, 11 Oct 2025 03:13:07 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/product/UserPolicyController.java | 241 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 197 insertions(+), 44 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 0133143..2d398ab 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
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -16,10 +17,15 @@
import com.ruoyi.im.util.RedisDistributedLock;
import com.ruoyi.im.util.UserPolicyUtils;
import com.ruoyi.system.domain.*;
+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;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
@@ -28,6 +34,9 @@
import javax.validation.Valid;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
@@ -35,6 +44,7 @@
@RestController
@RequestMapping("/userPolicy")
+@Slf4j
public class UserPolicyController extends BaseController {
@Autowired
@@ -54,8 +64,12 @@
@Autowired
InsuranceProductService insuranceProductService;
+
@Autowired
- private PayService payService;
+ PaymentRecordService paymentRecordService;
+
+ @Value("${pay.key}")
+ private String key;
/**
* 保险购买申请
@@ -135,9 +149,7 @@
wrapper.ne(UserPolicy::getApprovalStatus, 0);
}else{
wrapper.eq(UserPolicy::getApprovalStatus, 0);
- wrapper.eq(UserPolicy::getPayStatus,3)
- .or()
- .eq(UserPolicy::getPayStatus,2);
+ wrapper.eq(UserPolicy::getPayStatus,2);
}
// 按创建时间倒序排列
@@ -147,6 +159,30 @@
return getDataTable(list);
}
+
+ /**
+ * 保单列表
+ */
+ @GetMapping("/PaymentRecordList")
+ public TableDataInfo PaymentRecordList(@RequestParam(value = "payOrdeNo",required = false) String payOrdeNo,
+ @RequestParam(value = "paymentStatus",required = false) Integer paymentStatus) {
+ startPage();
+
+ LambdaQueryWrapper<PaymentRecord> wrapper = new LambdaQueryWrapper<>();
+
+ // 产品名称模糊查询
+ 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);
+ }
/**
* 保单审批
@@ -183,12 +219,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.setInsuranceBenefitExpiryDate(insuranceBenefitExpiryDate);
userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.ACTIVE);
userPolicy.setUpdatedAt(new Date());
userPolicyService.updateById(userPolicy);
@@ -196,7 +235,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());
@@ -208,6 +247,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());
@@ -264,7 +304,7 @@
}
/**
- * 计算保险到期日
+ * 计算保险到期日按天
* @param startDate 保险开始日期
* @param termDays 保险天数
* @return 保险到期日期
@@ -315,50 +355,163 @@
- /**
- * 支付回调接口 - 支付平台会调用这个接口
- */
@PostMapping("/notify")
- public String payNotify(@RequestParam Map<String, String> params) {
- System.out.println("收到支付回调: " + params);
+ public String payNotify(@RequestBody PayCallbackDTO callbackDTO) {
+ try {
+ log.info("收到支付回调通知: {}", JSON.toJSONString(callbackDTO));
- // 验证签名
- if (!payService.verifySign(params)) {
- System.out.println("签名验证失败");
- return "fail";
+ // 1. 验证签名
+ if (!verifySign(callbackDTO)) {
+ log.error("签名验证失败: {}", callbackDTO.getOrderId());
+ return "签名验证失败";
+ }
+
+ // 2. 根据订单号查询保单
+ UserPolicy userPolicy = userPolicyService.getOne(new LambdaQueryWrapper<UserPolicy>()
+ .eq(UserPolicy::getOrderNo, callbackDTO.getOrderId()));
+ if (userPolicy == null) {
+ log.error("订单不存在: {}", callbackDTO.getOrderId());
+ return "订单不存在";
+ }
+ if(userPolicy.getPayStatus() == 2){
+ log.error("订单已支付完成: {}", callbackDTO.getOrderId());
+ return "订单已支付完成";
+ }
+ // 3. 根据订单状态处理业务逻辑
+ boolean processResult = processPayResult(callbackDTO, userPolicy);
+
+ return processResult ? "success" : "fail";
+
+ } catch (Exception e) {
+ log.error("支付回调处理异常: {}", e.getMessage(), e);
+ return "FAIL";
}
-
- // 获取关键参数
- String orderNo = params.get("mchOrderNo");
- String status = params.get("status");
- String amount = params.get("amount");
-
- System.out.println("订单号: " + orderNo + ", 状态: " + status + ", 金额: " + amount);
-
- // 这里调用您的业务处理逻辑
- handlePayResult(orderNo, Integer.valueOf(status), params);
-
- return "success";
}
+ private boolean verifySign(PayCallbackDTO callbackDTO) {
+ try {
+ Map<String, Object> params = new HashMap<>();
+ params.put("channelCode", callbackDTO.getChannelCode());
+ params.put("orderId", callbackDTO.getOrderId());
+ params.put("orderMoney", callbackDTO.getOrderMoney());
+ params.put("orderStatus", callbackDTO.getOrderStatus());
+ params.put("userCode", callbackDTO.getUserCode());
- /**
- * 处理支付结果 - 这里您自己实现业务逻辑
- */
- private void handlePayResult(String orderNo, Integer status, Map<String, String> params) {
- UserPolicy userPolicy = userPolicyService.getOne(new LambdaQueryWrapper<UserPolicy>()
- .eq(UserPolicy::getOrderNo,orderNo)
- );
- if(ObjectUtil.isNotEmpty(userPolicy)){
- if ("2".equals(status)) {
- userPolicy.setPayStatus(status);
- } else if ("3".equals(status)) {
- userPolicy.setPayStatus(status);
- } else if ("0010".equals(status)) {
- userPolicy.setPayMsg("系统超时或异常");
- } else if ("0014".equals(status)) {
- userPolicy.setPayMsg("mchId是系统分配的商户号，不能自己生成");
+ String generatedSign = generateCallbackSign(params);
+ return generatedSign.equalsIgnoreCase(callbackDTO.getSign());
+ } catch (Exception e) {
+ log.error("签名验证异常: {}", e.getMessage(), e);
+ return false;
}
+ }
+
+ private String generateCallbackSign(Map<String, Object> params) {
+ try {
+ List<String> keys = new ArrayList<>(params.keySet());
+ Collections.sort(keys);
+
+ StringBuilder stringA = new StringBuilder();
+ for (String key : keys) {
+ Object value = params.get(key);
+ if (value != null && !"".equals(value.toString().trim()) && !"sign".equals(key)) {
+ if (stringA.length() > 0) {
+ stringA.append("&");
+ }
+ stringA.append(key).append("=").append(value.toString());
+ }
+ }
+
+ String stringSignTemp = stringA.toString() + "&key=" + key;
+ String md5Result = md5(stringSignTemp);
+ return md5Result.toLowerCase();
+
+ } catch (Exception e) {
+ throw new RuntimeException("生成回调签名失败: " + e.getMessage());
+ }
+ }
+
+ private boolean processPayResult(PayCallbackDTO callbackDTO, UserPolicy userPolicy) {
+ try {
+ switch (callbackDTO.getOrderStatus()) {
+ case 2: // 已支付
+ return handlePaySuccess(callbackDTO, userPolicy);
+ case 3: // 超时/过期
+ return handlePayTimeout(callbackDTO, userPolicy);
+ default:
+ log.info("订单状态未完成: {}, 状态: {}", callbackDTO.getOrderId(), callbackDTO.getOrderStatus());
+ return true;
+ }
+ } catch (Exception e) {
+ log.error("处理支付结果异常: {}", e.getMessage(), e);
+ return false;
+ }
+ }
+
+ private boolean handlePaySuccess(PayCallbackDTO callbackDTO, UserPolicy userPolicy) {
+ if (userPolicy.getPayStatus() == 2) {
+ log.info("订单已支付，无需重复处理: {}", callbackDTO.getOrderId());
+ return true;
+ }
+
+ userPolicy.setPayStatus(2); // 2-支付成功
+ userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.ACTIVE);
+ 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;
+ } else {
+ log.error("更新保单状态失败: {}", callbackDTO.getOrderId());
+ return false;
+ }
+ }
+
+ private boolean handlePayTimeout(PayCallbackDTO callbackDTO, UserPolicy userPolicy) {
+ userPolicy.setPayStatus(3); // 3-支付超时/过期
+ userPolicy.setPolicyStatus(UserPolicy.PolicyStatus.EXPIRED);
+ 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;
+ } else {
+ log.error("更新保单超时状态失败: {}", callbackDTO.getOrderId());
+ return false;
+ }
+ }
+
+ private String md5(String input) {
+ try {
+ MessageDigest md = MessageDigest.getInstance("MD5");
+ byte[] messageDigest = md.digest(input.getBytes(StandardCharsets.UTF_8));
+
+ StringBuilder hexString = new StringBuilder();
+ for (byte b : messageDigest) {
+ String hex = Integer.toHexString(0xff & b);
+ if (hex.length() == 1) {
+ hexString.append('0');
+ }
+ hexString.append(hex);
+ }
+ return hexString.toString();
+ } catch (NoSuchAlgorithmException e) {
+ throw new RuntimeException("MD5加密失败", e);
}
}
}
--
Gitblit v1.9.3