From 9b233cbcc955c23d1be041deb2a0d0c575df7cbc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 06 Jan 2026 13:51:54 +0800
Subject: [PATCH] 代收，代付
---
src/main/java/com/nq/pojo/RechargeCallbackThreeVo.java | 24 ++++++++++++
src/main/java/com/nq/pojo/PayoutCallbackVo.java | 34 +++++++++++++++++
src/main/resources/mapper/UserRechargeMapper.xml | 2
src/main/java/com/nq/pojo/PayoutOrderResponseVo.java | 41 ++++++++++++++++++++
4 files changed, 100 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nq/pojo/PayoutCallbackVo.java b/src/main/java/com/nq/pojo/PayoutCallbackVo.java
new file mode 100644
index 0000000..a136dc0
--- /dev/null
+++ b/src/main/java/com/nq/pojo/PayoutCallbackVo.java
@@ -0,0 +1,34 @@
+package com.nq.pojo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * @program: dabaogp
+ * @description: 代付回调VO
+ * @create: 2025-01-05
+ **/
+@Data
+public class PayoutCallbackVo {
+ @JsonProperty("merchant_id")
+ private String merchantId;
+
+ @JsonProperty("app_id")
+ private String appId;
+
+ @JsonProperty("system_order_id")
+ private String systemOrderId;
+
+ @JsonProperty("merchant_order_id")
+ private String merchantOrderId;
+
+ private String amount;
+
+ @JsonProperty("order_status")
+ private String orderStatus;
+
+ private String msg;
+
+ private String sign;
+}
+
diff --git a/src/main/java/com/nq/pojo/PayoutOrderResponseVo.java b/src/main/java/com/nq/pojo/PayoutOrderResponseVo.java
new file mode 100644
index 0000000..81273fc
--- /dev/null
+++ b/src/main/java/com/nq/pojo/PayoutOrderResponseVo.java
@@ -0,0 +1,41 @@
+package com.nq.pojo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * @program: dabaogp
+ * @description: 代付订单响应VO
+ * @create: 2025-01-05
+ **/
+@Data
+public class PayoutOrderResponseVo {
+ private Integer code;
+ private String message;
+ private PayoutOrderData data;
+
+ @Data
+ public static class PayoutOrderData {
+ @JsonProperty("merchant_id")
+ private String merchantId;
+
+ @JsonProperty("app_id")
+ private String appId;
+
+ @JsonProperty("system_order_id")
+ private String systemOrderId;
+
+ @JsonProperty("merchant_order_id")
+ private String merchantOrderId;
+
+ private String amount;
+
+ @JsonProperty("order_status")
+ private String orderStatus;
+
+ private String msg;
+
+ private String sign;
+ }
+}
+
diff --git a/src/main/java/com/nq/pojo/RechargeCallbackThreeVo.java b/src/main/java/com/nq/pojo/RechargeCallbackThreeVo.java
new file mode 100644
index 0000000..05e9fa8
--- /dev/null
+++ b/src/main/java/com/nq/pojo/RechargeCallbackThreeVo.java
@@ -0,0 +1,24 @@
+package com.nq.pojo;
+
+import lombok.Data;
+
+/**
+ * @program: dabaogp
+ * @description: 充值回调3 - 接收JSON格式参数
+ * @create: 2025-01-05
+ **/
+@Data
+public class RechargeCallbackThreeVo {
+
+ private String merchant_id; // 商户号
+ private String app_id; // 应用ID
+ private String merchant_order_id; // 商户订单号
+ private String system_order_id; // 系统订单号
+ private String amount; // 交易金额
+ private String account_amount; // 到账金额
+ private String order_status; // 订单状态 (PAY_SUCCESS, PAY_FAIL, PAY_ING)
+ private String msg; // 消息
+ private String sign; // 签名
+
+}
+
diff --git a/src/main/resources/mapper/UserRechargeMapper.xml b/src/main/resources/mapper/UserRechargeMapper.xml
index ecda781..5ee756f 100644
--- a/src/main/resources/mapper/UserRechargeMapper.xml
+++ b/src/main/resources/mapper/UserRechargeMapper.xml
@@ -217,7 +217,7 @@
s.id, s.user_id, s.nick_name, s.agent_id, s.order_sn, s.pay_sn, s.pay_channel,
s.pay_amt, s.order_status,s.order_desc,s.add_time,s.pay_time,s.pay_id,s.img ,p.channel_name,p.assets_type
FROM user_recharge s
- join site_pay p
+ left join site_pay p
on s.pay_id = p.id
where 1=1
<if test="agentId != null and agentId != ''">
--
Gitblit v1.9.3