From 3f9f3c40338190497d42c891dc0690789b834df6 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期三, 12 二月 2025 13:19:55 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into xizang-changyun
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 7de5c90..14c59f3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -222,7 +222,7 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
- save.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
+ save.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
save.setBankSerialNumber(dto.getBankSerilNum());
save.setFlowType(2);
save.setPaymentBillId(bill.getId());
@@ -235,7 +235,7 @@
TBankFlow bankFlow = new TBankFlow();
bankFlow.setPayType(3);
bankFlow.setPayer(dto.getPayer());
- bankFlow.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
+ bankFlow.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
bankFlow.setBankSerialNumber(dto.getBankSerilNum());
bankFlow.setFlowMoney(dto.getAmount());
bankFlow.setFlowStatus(1);
--
Gitblit v1.7.1