zj
2026-01-06 9b233cbcc955c23d1be041deb2a0d0c575df7cbc
代收,代付
1 files modified
3 files added
101 ■■■■■ changed files
src/main/java/com/nq/pojo/PayoutCallbackVo.java 34 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/pojo/PayoutOrderResponseVo.java 41 ●●●●● patch | view | raw | blame | history
src/main/java/com/nq/pojo/RechargeCallbackThreeVo.java 24 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/UserRechargeMapper.xml 2 ●●● patch | view | raw | blame | history
src/main/java/com/nq/pojo/PayoutCallbackVo.java
New file
@@ -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;
}
src/main/java/com/nq/pojo/PayoutOrderResponseVo.java
New file
@@ -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;
    }
}
src/main/java/com/nq/pojo/RechargeCallbackThreeVo.java
New file
@@ -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;                // 签名
}
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 != ''">