From 65605037d31f827196fff8c93540da5c7f9e6671 Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 12 二月 2025 12:12:48 +0800
Subject: [PATCH] feat:添加支付时间
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java | 3 ++-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 4 ++--
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java | 1 +
ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java | 6 ++++++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java
index b095e80..7d551f9 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/PayController.java
@@ -58,6 +58,7 @@
confirm.setBillId(CollectionUtil.join(dto.getBillIds(),","));
confirm.setVoucher(dto.getVoucher());
confirm.setPayFeesMoney(new BigDecimal(dto.getAmount()).divide(AmountConstant.b100).setScale(2, RoundingMode.HALF_DOWN).doubleValue());
+ confirm.setPayTime(dto.getPayTime());
tBillConfirmService.save(confirm);
for (TBill tBill : tBills) {
TBill save = new TBill();
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java
index d4f5661..fdaf862 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayDto.java
@@ -1,11 +1,13 @@
package com.ruoyi.system.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.util.Date;
import java.util.List;
@Data
@@ -32,5 +34,9 @@
@NotEmpty(message = "凭证文件不能为空")
private String voucher;
+ @ApiModelProperty(value = "支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date payTime;
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java
index ffd70d3..144fd34 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TBillConfirm.java
@@ -12,6 +12,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -51,7 +52,7 @@
@ApiModelProperty(value = "支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
- private LocalDateTime payTime;
+ private Date payTime;
}
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