From 71ce1c0620d60cca346acdb9bb4301ca15dfb757 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 21 Jan 2025 11:08:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bsd/pjcloud/wallet/api/entity/WalletForeignEntity.java  | 6 ++++++
 .../bsd/pjcloud/wallet/api/entity/WalletFreezeEntity.java   | 6 ++++++
 .../bsd/pjcloud/wallet/api/entity/WalletStrideEntity.java   | 6 ++++++
 .../wallet/service/impl/WalletForeignServiceImpl.java       | 2 +-
 .../wallet/service/impl/WalletFreezeServiceImpl.java        | 2 +-
 .../wallet/service/impl/WalletStrideServiceImpl.java        | 2 +-
 .../src/main/resources/mapper/WalletFreezeMapper.xml        | 1 +
 7 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletForeignEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletForeignEntity.java
index 8164f2fad..5662267be 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletForeignEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletForeignEntity.java
@@ -51,6 +51,12 @@ public class WalletForeignEntity extends Model<WalletForeignEntity> {
     @Schema(description = "流程状态")
     private String processStatus;
 
+    /**
+     * 审核时间
+     */
+    @Schema(description = "审核时间")
+    private LocalDateTime processTime;
+
     /**
      * 部门id
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletFreezeEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletFreezeEntity.java
index 170ad31dd..802a9969d 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletFreezeEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletFreezeEntity.java
@@ -44,6 +44,12 @@ public class WalletFreezeEntity extends Model<WalletFreezeEntity> {
     @Schema(description = "流程状态")
     private String processStatus;
 
+    /**
+     * 审核时间
+     */
+    @Schema(description = "审核时间")
+    private LocalDateTime processTime;
+
     /**
      * 钱包id
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletStrideEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletStrideEntity.java
index b835c68de..9dcebf3b7 100644
--- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletStrideEntity.java
+++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/WalletStrideEntity.java
@@ -44,6 +44,12 @@ public class WalletStrideEntity extends Model<WalletStrideEntity> {
     @Schema(description = "流程状态")
     private String processStatus;
 
+    /**
+     * 审核时间
+     */
+    @Schema(description = "审核时间")
+    private LocalDateTime processTime;
+
     /**
      * 部门id
      */
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletForeignServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletForeignServiceImpl.java
index a9aafce77..26b758485 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletForeignServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletForeignServiceImpl.java
@@ -159,7 +159,7 @@ public class WalletForeignServiceImpl extends ServiceImpl<WalletForeignMapper, W
         try {
             Boolean isConsent = flowUtil.isConsent(dto);
             String processStatus = isConsent ? TaskCheckStatusEnum.RESULT.getCode() : TaskCheckStatusEnum.REJECT.getCode();
-            baseMapper.updateById(WalletForeignEntity.builder().id(detail.getId()).processStatus(processStatus).build());
+            baseMapper.updateById(WalletForeignEntity.builder().id(detail.getId()).processStatus(processStatus).processTime(LocalDateTime.now()).build());
             // 创建券
             if (isConsent) {
                 walletCodeUseService.generate(detail.getId(), detail.getUserId(), WalletCodeBizEnum.FOREIGN, detail.getCount());
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java
index 0461f87d0..8f952722d 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletFreezeServiceImpl.java
@@ -154,7 +154,7 @@ public class WalletFreezeServiceImpl extends ServiceImpl<WalletFreezeMapper, Wal
         try {
             Boolean isConsent = flowUtil.isConsent(dto);
             String processStatus = isConsent ? TaskCheckStatusEnum.RESULT.getCode() : TaskCheckStatusEnum.REJECT.getCode();
-            baseMapper.updateById(WalletFreezeEntity.builder().id(detail.getId()).freeStatus(YesNoEnum.YES.getCode()).processStatus(processStatus).build());
+            baseMapper.updateById(WalletFreezeEntity.builder().id(detail.getId()).freeStatus(YesNoEnum.YES.getCode()).processStatus(processStatus).processTime(LocalDateTime.now()).build());
             if (isConsent) {
                 // 更改钱包状态
                 WalletManageEntity walletUpdateObj = WalletManageEntity.builder().id(detail.getWalletId()).isFreeze(YesNoEnum.YES.getCode()).build();
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java
index e4395c65a..f50a0fbcb 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletStrideServiceImpl.java
@@ -169,7 +169,7 @@ public class WalletStrideServiceImpl extends ServiceImpl<WalletStrideMapper, Wal
         try {
             Boolean isConsent = flowUtil.isConsent(dto);
             String processStatus = isConsent ? TaskCheckStatusEnum.RESULT.getCode() : TaskCheckStatusEnum.REJECT.getCode();
-            baseMapper.updateById(WalletStrideEntity.builder().id(detail.getId()).processStatus(processStatus).build());
+            baseMapper.updateById(WalletStrideEntity.builder().id(detail.getId()).processStatus(processStatus).processTime(LocalDateTime.now()).build());
             // 创建券
             if (isConsent) {
                 walletCodeUseService.generate(detail.getId(), detail.getUserId(), WalletCodeBizEnum.STRIDE, detail.getCount());
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletFreezeMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletFreezeMapper.xml
index 72a12f411..be0938e8b 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletFreezeMapper.xml
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletFreezeMapper.xml
@@ -23,6 +23,7 @@
         select a.id,
                a.process_id,
                a.process_status,
+               a.process_time,
                a.wallet_id,
                a.user_id,
                a.dept_id,