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/PaymentSyncServiceImpl.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PaymentSyncServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PaymentSyncServiceImpl.java
index 2a8e338..f927f3c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PaymentSyncServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/PaymentSyncServiceImpl.java
@@ -73,7 +73,6 @@
* 灏嗘柊绯荤粺鏀粯璁板綍鍚屾鍒版棫绯荤粺PaidMoney琛�
*/
@Override
- @Transactional
public boolean syncPaymentToLegacy(SysTaskPayment payment) {
Long paymentId = payment.getId();
try {
@@ -116,14 +115,20 @@
PaidMoney paidMoney = new PaidMoney();
paidMoney.setPaidMoneyClass("FI"); // 榛樿FI
paidMoney.setServiceOrdIDDt(emergency.getLegacyServiceOrdId());
- paidMoney.setDispatchOrdIDDt(emergency.getLegacyDispatchOrdId());
+ if(emergency.getLegacyDispatchOrdId()!=null) {
+ paidMoney.setDispatchOrdIDDt(emergency.getLegacyDispatchOrdId());
+ }
paidMoney.setPaidMoney(payment.getSettlementAmount());
paidMoney.setPaidMoneyType(convertPaymentMethodToLegacy(payment.getPaymentMethod()));
- paidMoney.setPaidMoneyMono(payment.getTradeNo() != null ? payment.getTradeNo() : payment.getOutTradeNo());
+ String outTradeNo = payment.getTradeNo() != null ? payment.getTradeNo() : payment.getOutTradeNo();
+ if(!outTradeNo.contains("[鏀粯涓撶敤]")){
+ outTradeNo=outTradeNo+"[鏀粯涓撶敤]";
+ }
+ paidMoney.setPaidMoneyMono(outTradeNo);
paidMoney.setPaidMoneyTime(payment.getPayTime() != null ? payment.getPayTime() : new Date());
paidMoney.setPaidMoneyOaID(oaUserId);
paidMoney.setPaidMoneyUnitID(0); // 榛樿涓�0
- paidMoney.setPaidMoneyAPCheck(1); // 宸茬‘璁�
+ paidMoney.setPaidMoneyAPCheck(0); // 宸茬‘璁�
paidMoney.setPaidMoneyAPTime(new Date());
paidMoney.setPaidMoneyTimestamp(String.valueOf(System.currentTimeMillis()));
@@ -163,7 +168,7 @@
// 2. 妫�鏌ユ槸鍚﹀凡鍚屾杩�
SysTaskPayment existPayment = sysTaskPaymentMapper.selectByPid(paidMoney.getId());
if (existPayment != null) {
- log.info("鏃х郴缁熸敮浠樿褰曞凡鍚屾锛宲aidMoneyId: {}, paymentId: {}", paidMoney.getId(), existPayment.getId());
+// log.info("鏃х郴缁熸敮浠樿褰曞凡鍚屾锛宲aidMoneyId: {}, paymentId: {}", paidMoney.getId(), existPayment.getId());
return true;
}
--
Gitblit v1.9.1