From 40a8157440e3b906da8f52e07d939d78c3f4c313 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 12 四月 2026 16:14:06 +0800
Subject: [PATCH] feat: 任务增加统计、同步增加通知
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java
index d527724..209d540 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysTaskPaymentServiceImpl.java
@@ -82,9 +82,9 @@
SysTaskEmergency emergencyInfo = sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
BigDecimal transferPrice = emergencyInfo != null && emergencyInfo.getTransferPrice() != null
? emergencyInfo.getTransferPrice() : BigDecimal.ZERO;
-
+ task.setEmergencyInfo(emergencyInfo);
// 鑾峰彇浠诲姟鍩烘湰淇℃伅
- String taskCode = task.getTaskCode();
+ String taskCode = task.getShowTaskCode();
String taskType = task.getTaskType();
// 鑾峰彇杞﹁締淇℃伅
@@ -146,7 +146,6 @@
}
@Override
- @Transactional
public BigDecimal addAdditionalFee(Long taskId, String feeType, String feeName,
BigDecimal unitAmount, Integer quantity, String remark) {
// 楠岃瘉鍙傛暟
@@ -185,14 +184,13 @@
}
@Override
- @Transactional
+
public BigDecimal removeAdditionalFee(Long taskId, Long feeId) {
additionalFeeMapper.deleteById(feeId);
return calculateAdditionalAmount(taskId);
}
@Override
- @Transactional
public TaskPaymentResultVO createPayment(TaskPaymentCreateVO createVO) {
Long taskId = createVO.getTaskId();
String paymentMethod = createVO.getPaymentMethod();
@@ -213,7 +211,9 @@
// 鏌ヨ浠诲姟缂栧彿
SysTask task = sysTaskMapper.selectSysTaskByTaskId(taskId);
- String taskCode = task.getTaskCode();
+ SysTaskEmergency emergency=sysTaskEmergencyMapper.selectSysTaskEmergencyByTaskId(taskId);
+ task.setEmergencyInfo(emergency);
+ String taskCode = task.getShowTaskCode();
// 鐢熸垚鍟嗘埛璁㈠崟鍙�: {taskCode}-{timestampMillis}
String outTradeNo = taskCode + "-" + System.currentTimeMillis();
@@ -262,6 +262,7 @@
// 鐢熸垚鍥炶皟鍦板潃
String callbackUrl = callbackBaseUrl + "/payment/callback/" + provider.toLowerCase();
+
payment.setCallbackUrl(callbackUrl);
try {
@@ -361,7 +362,7 @@
}
@Override
- @Transactional
+
public boolean handlePaymentCallback(String outTradeNo, String tradeNo, String provider) {
log.info("鏀跺埌鏀粯鍥炶皟锛歰utTradeNo={}, tradeNo={}, provider={}", outTradeNo, tradeNo, provider);
--
Gitblit v1.9.1