TRX 1 년 전
부모
커밋
e10468aa1b

+ 3 - 2
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/CooperatorSuperParam.java

@@ -1,5 +1,6 @@
 package com.zhongshu.payment.client.payModel.cooperator.model;
 
+import com.zhongshu.card.client.utils.DateUtils;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -10,6 +11,6 @@ import lombok.Data;
 @Data
 public class CooperatorSuperParam {
 
-    @Schema(description = "报文请求时间")
-    private String reqTs;
+    @Schema(description = "报文请求时间, 格式:yyyyMMddHHmmss,请求时间,与当前时间差不能超过5分钟")
+    private String reqTs = DateUtils.paresTime(System.currentTimeMillis(), DateUtils.unionAuth);
 }

+ 25 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/OpenWithdrawParam.java

@@ -0,0 +1,25 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * 收钱吧-平台方通知开通D+0提现 参数
+ *
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class OpenWithdrawParam extends CooperatorSuperParam {
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "商户号")
+    private String mchntNo;
+
+}

+ 72 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/OpenWithdrawResponse.java

@@ -0,0 +1,72 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import com.github.microservice.models.requestModel.SuperCooperatorResponseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * 收钱吧-平台方通知开通D+0提现 响应
+ *
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class OpenWithdrawResponse extends SuperCooperatorResponseModel {
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "商户号")
+    private String mchntNo;
+
+    @Schema(description = "是否满足开通D0标记 00:不满90天 01:满足开通条件02:商户异常")
+    private String status;
+
+    @Schema(description = "是否允许开通")
+    private Boolean isAllow = Boolean.FALSE;
+
+    public Boolean getIsAllow() {
+        if (status != null && "01".equals(status)) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
+    private String statusStr;
+
+    public String getStatusStr() {
+        if (status != null) {
+            if ("00".equals(status)) {
+                return "不满90天";
+            } else if ("01".equals(status)) {
+                return "满足开通条件";
+            } else if ("02".equals(status)) {
+                return "不许开通";
+            }
+        }
+        return "";
+    }
+
+    @Schema(description = "划付类型 D0A:D0A划付-自由提现 D0B:D0B划付-自动划付 T0A:T0A划付-自由提现")
+    private String type;
+
+    private String typeStr;
+
+    public String getType() {
+        if (type != null) {
+            if ("D0A".equals(type)) {
+                return "D0A划付-自由提现";
+            } else if ("D0B".equals(type)) {
+                return "D0B划付-自动划付";
+            } else if ("T0A".equals(type)) {
+                return "T0A划付-自由提现";
+            }
+        }
+        return "";
+    }
+
+}

+ 57 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/ProcessWithdrawParam.java

@@ -0,0 +1,57 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * 提现 参数
+ *
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class ProcessWithdrawParam extends CooperatorSuperParam {
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "商户号")
+    private String mchntNo;
+
+    @Schema(description = "系统订单号, 外部平台需保证各自系统上传的该字段的唯一性")
+    private String sysOrderId;
+
+    @Schema(description = "提现通知URL")
+    private String notifyUrl;
+
+    @Schema(description = "提现类型  0 - D0 1 - D1(对公对私是TN内部维护)")
+    private String withdrawType = "0";
+
+    @Schema(description = "提现金额 单位分")
+    private String withdrawAmt;
+
+    @Schema(description = "多应用类型 74")
+    private String appType;
+
+    @Schema(description = "提现手续费扣率 提现手续费扣率,必须>=0, 例如:0.001")
+    private String feeRatio = "0";
+
+    @Schema(description = "提现备注")
+    private String remark;
+
+    @Schema(description = "补贴标记 0-不补贴 1-补贴(如果上送了该标记字段值为1,D0提现不判断手续费是否满足保底,否则要判断)")
+    private String subsFlag = "0";
+
+    @Schema(description = "保底手续费 不能为空,最长18位,全为数字,单位:分")
+    private String minFee = "0";
+
+    @Schema(description = "垫资手续费补贴标记 0:不补贴 1:补贴(传1时,如果有垫支手续费则由机构承担,否则由商户承担)")
+    private String d0SubsFlag = "0";
+
+    @Schema(description = "提现附言 提现附言长度最长40位,数字字母40个,汉字20个")
+    private String postscript;
+}

+ 30 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/ProcessWithdrawResponse.java

@@ -0,0 +1,30 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import com.github.microservice.models.requestModel.SuperCooperatorResponseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class ProcessWithdrawResponse extends SuperCooperatorResponseModel {
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "系统订单号")
+    private String sysOrderId;
+
+    @Schema(description = "流水号")
+    private String ssn;
+
+    @Schema(description = "商户编号")
+    private String mchntNo;
+
+}

+ 31 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/QueryOrderStatusParam.java

@@ -0,0 +1,31 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * 提现状态查询 参数
+ *
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class QueryOrderStatusParam extends CooperatorSuperParam {
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "mchntNo")
+    private String mchntNo;
+
+    @Schema(description = " 交易日期 格式yyyyMMDD")
+    private String transDate;
+
+    @Schema(description = "系统订单号 外部平台需保证各自系统上传的该字段的唯一性")
+    private String sysOrderId;
+
+}

+ 85 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/QueryOrderStatusResponse.java

@@ -0,0 +1,85 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import com.github.microservice.models.requestModel.SuperCooperatorResponseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * 提现状态查询 响应
+ *
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class QueryOrderStatusResponse extends SuperCooperatorResponseModel {
+
+    @Schema(description = "提现金额 单位:分")
+    private String transAmt;
+
+    @Schema(description = "手续费")
+    private String fee;
+
+    @Schema(description = "商户号")
+    private String mchntNo;
+
+    @Schema(description = "提现流水号")
+    private String ssn;
+
+    @Schema(description = "提现时间 格式:YYYY-MM-DD HH:MM:SS")
+    private String transTime;
+
+    @Schema(description = "提现结果 -1:数据问题 0:处理中 1:已记账未支付;2:已支付,状态未知;3:处理成功;4:支付失败;5:支付失败,余额已退回6:已手工重新发起支付")
+    private String status;
+
+    private String statusStr;
+
+    public String getStatusStr() {
+        if (status != null) {
+            switch (status) {
+                case "-1":
+                    return "数据问题";
+                case "0":
+                    return "处理中";
+                case "1":
+                    return "已记账未支付";
+                case "2":
+                    return "已支付,状态未知";
+                case "3":
+                    return "处理成功";
+                case "4":
+                    return "支付失败";
+                case "5":
+                    return "支付失败,余额已退回";
+                case "6":
+                    return "已手工重新发起支付";
+            }
+        }
+        return "";
+    }
+
+    @Schema(description = "提现结果描述")
+    private String desc;
+
+    @Schema(description = "系统订单号  外部平台提现时上送的系统订单号")
+    private String sysOrderId;
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "备注")
+    private String remark;
+
+    @Schema(description = "支付记录状态 策略对账状态")
+    private String payRecStatus;
+
+    @Schema(description = "处理备注 策略对账描述")
+    private String handleRemark;
+
+    @Schema(description = "支付结果描述 策略对账结果描述")
+    private String payResultDesc;
+
+}

+ 25 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/QueryWithdrawAuthstatusParam.java

@@ -0,0 +1,25 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * 收钱吧-D+0开通权限查询 参数
+ *
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class QueryWithdrawAuthstatusParam extends CooperatorSuperParam {
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "商户号")
+    private String mchntNo;
+
+}

+ 53 - 0
PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/cooperator/model/QueryWithdrawAuthstatusResponse.java

@@ -0,0 +1,53 @@
+package com.zhongshu.payment.client.payModel.cooperator.model;
+
+import com.github.microservice.models.requestModel.SuperCooperatorResponseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.internal.build.AllowPrintStacktrace;
+
+/**
+ * 收钱吧-D+0开通权限查询 响应
+ *
+ * @author TRX
+ * @date 2024/9/5
+ */
+@Data
+@AllowPrintStacktrace
+@NoArgsConstructor
+public class QueryWithdrawAuthstatusResponse extends SuperCooperatorResponseModel {
+
+    @Schema(description = "系统编号")
+    private String sysId;
+
+    @Schema(description = "商户号")
+    private String mchntNo;
+
+    @Schema(description = "是否满足开通D0标记  00:不满90天 01:满足开通条件02:不许开通")
+    private String status;
+
+    @Schema(description = "是否允许开通")
+    private Boolean isAllow = Boolean.FALSE;
+
+    public Boolean getIsAllow() {
+        if (status != null && "01".equals(status)) {
+            return Boolean.TRUE;
+        }
+        return Boolean.FALSE;
+    }
+
+    private String statusStr;
+
+    public String getStatusStr() {
+        if (status != null) {
+            if ("00".equals(status)) {
+                return "不满90天";
+            } else if ("01".equals(status)) {
+                return "满足开通条件";
+            } else if ("02".equals(status)) {
+                return "不许开通";
+            }
+        }
+        return "";
+    }
+}