From d4510476c58ae9de998aca09db91f83259f127a2 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 03 三月 2026 09:17:52 +0800
Subject: [PATCH] 优化
---
ruoyi-system/src/main/java/com/ruoyi/system/task/jobs/OrderJob.java | 1 +
ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WxRefundUtil.java | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java | 6 +++++-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java | 2 +-
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java | 2 +-
5 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
index 78d697a..e8cd78f 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/ConvenienceController.java
@@ -152,6 +152,10 @@
tCommunityActivity.setUserNum(tCommunityActivityRegistrations.size());
String finalUserId = userId;
if (finalUserId != null) {
+ long count = tCommunityActivityRegistrations.stream().filter(e -> e.getAppUserId().equals(finalUserId)).count();
+ if(count>0){
+ tCommunityActivity.setState(2);
+ }
}
@@ -179,7 +183,7 @@
if (count > 0) {
tCommunityActivity.setUserNum((int) count);
}
- if(userId!=null){
+ if (userId != null) {
tCommunityActivity.setState(tCommunityActivityRegistrationService.count(new LambdaQueryWrapper<TCommunityActivityRegistration>().eq(TCommunityActivityRegistration::getActivityId, id).eq(TCommunityActivityRegistration::getAppUserId, userId)) > 0 ? 2 : 1);
}
return R.ok(tCommunityActivity);
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
index 820ace5..78f812b 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/InsuranceController.java
@@ -195,7 +195,7 @@
// refundModel.setAmount(new WxPaymentRefundModel.RefundAmount(courseOrder1.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue(), "CNY", courseOrder1.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue()));
// Map<String, Object> refund = wxV3Pay.refund(refundModel);
// System.out.println(refund);
- String result = wxRefundUtil.refund(order1.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue(), order1.getPayNo(),outRefundNo);
+ String result = wxRefundUtil.refundInsurance(order1.getPayMoney().multiply(BigDecimal.valueOf(100)).intValue(), order1.getPayNo(),outRefundNo);
if(result!=null){
return R.fail(result);
}
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java
index b13116e..fa394e3 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/WxPayController.java
@@ -273,7 +273,7 @@
order.setRefundTransactionId(transaction_id);
tInsuranceOrderService.updateById(order);
- wxV3Pay.ack();
+ wxV3Pay.ack(true, "退款成功");
}
}catch (Exception e){
wxV3Pay.ack(false, "不是成功的退款状态");
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/task/jobs/OrderJob.java b/ruoyi-system/src/main/java/com/ruoyi/system/task/jobs/OrderJob.java
index 80081d7..c1fbd9d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/task/jobs/OrderJob.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/task/jobs/OrderJob.java
@@ -18,6 +18,7 @@
@Override
public void execute(JobExecutionContext context)
throws JobExecutionException {
+ System.err.println("订单定时任务开始执行");
JobDataMap maps = context.getMergedJobDataMap();
String id = maps.getString("id");
try {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WxRefundUtil.java b/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WxRefundUtil.java
index 3a53939..7239363 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WxRefundUtil.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/wxPay/utils/WxRefundUtil.java
@@ -94,7 +94,7 @@
request.outTradeNo = outTradeNo;
request.reason = "退款";
request.fundsAccount = ReqFundsAccount.AVAILABLE;
- request.notifyUrl =this.wxV3Pay.getConfig().getV3().getNotifyRefundUrl();
+ request.notifyUrl =this.wxV3Pay.getConfig().getV3().getNotifyInsuranceRefundUrl();
request.amount = new AmountReq();
request.amount.refund = money;
request.outRefundNo =outRefundNo;
--
Gitblit v1.7.1