From 67eefb743657db9f0c80f930090a0f788e242a0a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 26 Mar 2025 19:26:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=AD=A3=E5=85=83=E4=BD=99=E9=A2=9D?=
 =?UTF-8?q?=E4=B8=8D=E8=B6=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/zy/ThirdZySelfServiceImpl.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ThirdZySelfServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ThirdZySelfServiceImpl.java
index c6ab6dcd3..a3567ea67 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ThirdZySelfServiceImpl.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ThirdZySelfServiceImpl.java
@@ -137,7 +137,7 @@ public class ThirdZySelfServiceImpl implements ThirdZySelfService {
             refundDto.setSerialNum(dto.getSerialNum());
             HardCallbackRefundVo refundRes = hardCallback.refund(refundDto).getData();
             result.setCode(refundRes.getCode().getType());
-            result.setCode(refundRes.getCode().getDescription());
+            result.setMsg(refundRes.getCode().getDescription());
             ZySelfPayVo zySelfPayVo = new ZySelfPayVo();
             // 人员编号
             ThirdZyIdDictEntity userIdDict = thirdZyIdDictMapper.getBySelfId(ThirdZyBizEnumType.SYNC_ACCOUNT_INFO, String.valueOf(refundRes.getUserId()));
@@ -146,16 +146,15 @@ public class ThirdZySelfServiceImpl implements ThirdZySelfService {
             zySelfPayVo.setAccName(refundRes.getUsername());
             zySelfPayVo.setPerCode(userZyId);
             zySelfPayVo.setSerialNum(refundRes.getOrderNo());
-            zySelfPayVo.setRecDate(LocalDateTimeUtil.format(refundRes.getRefundTime(), DatePattern.NORM_DATETIME_PATTERN));
             switch (refundRes.getCode()) {
                 case SUCCESS -> {
-                    ZySelfPayVo success = new ZySelfPayVo();
-                    success.setPlatformSerialNum(String.valueOf(refundRes.getRefundId()));
-                    success.setAmount(dto.getAmount());
-                    result.setMsg(ZyBaseVo.selfSuccessMsg);
+                    zySelfPayVo.setPlatformSerialNum(String.valueOf(refundRes.getRefundId()));
+                    zySelfPayVo.setAmount(dto.getAmount());
+                    zySelfPayVo.setRecDate(LocalDateTimeUtil.format(refundRes.getRefundTime(), DatePattern.NORM_DATETIME_PATTERN));
                 }
                 default -> {
                     zySelfPayVo.setPlatformSerialNum("temporary_" + dto.getSerialNum());
+                    zySelfPayVo.setRecDate(LocalDateTimeUtil.format(LocalDateTime.now(), DatePattern.NORM_DATETIME_PATTERN));
                 }
             }
             Map<String, Object> resMap = BeanUtil.beanToMap(result);
@@ -237,7 +236,6 @@ public class ThirdZySelfServiceImpl implements ThirdZySelfService {
             result.setMsg(payRes.getCode().getDescription());
             ZySelfPayVo zySelfPayVo = new ZySelfPayVo();
             zySelfPayVo.setSerialNum(dto.getSerialNum());
-            zySelfPayVo.setRecDate(LocalDateTimeUtil.format(payRes.getPayTime(), DatePattern.NORM_DATETIME_PATTERN));
             switch (payRes.getCode()) {
                 case SUCCESS -> {
                     zySelfPayVo.setAccNum(payRes.getUserId().toString());
@@ -245,9 +243,11 @@ public class ThirdZySelfServiceImpl implements ThirdZySelfService {
                     zySelfPayVo.setPerCode(payRes.getUserId().toString());
                     zySelfPayVo.setPlatformSerialNum(payRes.getOrderId().toString());
                     zySelfPayVo.setAmount(amount);
+                    zySelfPayVo.setRecDate(LocalDateTimeUtil.format(payRes.getPayTime(), DatePattern.NORM_DATETIME_PATTERN));
                 }
                 default -> {
                     zySelfPayVo.setPlatformSerialNum("temporary_" + dto.getSerialNum());
+                    zySelfPayVo.setRecDate(LocalDateTimeUtil.format(LocalDateTime.now(), DatePattern.NORM_DATETIME_PATTERN));
                 }
             }
             Map<String, Object> resMap = BeanUtil.beanToMap(result);