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 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;