From c7aa65a3730129106f2ef1eb0e2b053664082cb9 Mon Sep 17 00:00:00 2001
From: Yuan <1450637472@qq.com>
Date: Thu, 25 Sep 2025 16:08:34 +0800
Subject: [PATCH] =?UTF-8?q?init:=E5=AE=81=E5=A4=8F=E6=AD=A6=E8=AD=A6?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hgddmz/controller/GetDateController.java     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/saye/hgddmz/controller/GetDateController.java b/src/main/java/com/saye/hgddmz/controller/GetDateController.java
index 15a1d57..8514b01 100644
--- a/src/main/java/com/saye/hgddmz/controller/GetDateController.java
+++ b/src/main/java/com/saye/hgddmz/controller/GetDateController.java
@@ -853,6 +853,8 @@ public class GetDateController {
             String mch_id = StringDUtil.changeNullToEmpty(map.get("MCH_ID"));
             String trade_date = StringDUtil.changeNullToEmpty(map.get("trade_date"));
 
+            log.info("开始获取微信账单，参数: mch_id={}, trade_date={}", mch_id, trade_date);
+
         HashMap<String, Object> reqMap = new HashMap<>();
         reqMap.put("grant_type", grant_type);
         reqMap.put("appid", appid);
@@ -879,6 +881,7 @@ public class GetDateController {
                 .execute()
                 .body();
         log.info("微信账单接口返回数据长度: {}", body1 != null ? body1.length() : 0);
+        log.info("微信账单接口返回数据: {}", body1);
 
         // 检查微信接口返回状态
 
@@ -946,9 +949,8 @@ public class GetDateController {
                         bankbillHistory.setCQsje(value);
                         break;
                     case 24: // 订单金额
-                        if (flag < 0) {
-                            bankbillHistory.setCJyje("-" + value);
-                        } else {
+                        // 只有在非退款状态时才设置订单金额
+                        if (flag >= 0) {
                             bankbillHistory.setCJyje(value);
                         }
                         break;
@@ -958,14 +960,14 @@ public class GetDateController {
                     case 22: // 手续费
                         bankbillHistory.setCSxf(value);
                         break;
-                    case 15: // 微信退款单号
+                    case 14: // 微信退款单号
                         bankbillHistory.setCThddh(value);
                         break;
-                    case 16: // 商户退款单号
+                    case 15: // 商户退款单号
                         bankbillHistory.setCYjylsh(value);
                         break;
-                    case 17: // 退款金额
-                        if (!"0.00".equals(value)) {
+                    case 25: // 申请退款金额
+                        if (!"0.00".equals(value) && !value.isEmpty()) {
                             bankbillHistory.setCJyje("-" + value);
                         }
                         break;