瀏覽代碼

更新!

TRX 1 年之前
父節點
當前提交
c46fc0a6f2

+ 34 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/PayConfigField.java

@@ -0,0 +1,34 @@
+package com.zhongshu.card.client.model.paySetting.paySetting;
+
+import com.github.microservice.types.payment.PayFieldType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 支付参数字段
+ *
+ * @author TRX
+ * @date 2024/10/22
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PayConfigField {
+
+    @Schema(description = "字段名称,如:名称,appId")
+    private String name;
+
+    @Schema(description = "字段类型,如:Str, File")
+    private PayFieldType type;
+
+    @Schema(description = "对应的后端字段")
+    private String key;
+
+    @Schema(description = "是否必须")
+    private Boolean isMust = Boolean.TRUE;
+
+    @Schema(description = "备注")
+    private String remark;
+}

+ 15 - 2
FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/WxPayConfigModel.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author TRX
@@ -33,9 +34,9 @@ public class WxPayConfigModel {
     private String apiV3Key;
 
     @Schema(description = "认证类型")
-    private String authenticationType;
+    private String authenticationType = "WECHATPAY2-SHA256-RSA2048";
 
-    @Schema(description = "key文件地址类型,oss、local")
+    @Schema(description = "key文件地址类型,oss、local、str")
     private String privateKeyType = "";
 
     @Schema(description = "私钥地址")
@@ -47,4 +48,16 @@ public class WxPayConfigModel {
     @Schema(description = "支付成功回调地址")
     private String notifyUrl;
 
+    @Schema(description = "支付证书是否配置")
+    private Boolean privateKeyIsComplete = Boolean.FALSE;
+
+    public Boolean getPrivateKeyIsComplete() {
+        if (privateKeyType != null) {
+            if ("str".equals(privateKeyType) && StringUtils.isNotEmpty(privateKeyStr)) {
+                return Boolean.TRUE;
+            }
+        }
+        return Boolean.FALSE;
+    }
+
 }

+ 0 - 3
FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/WxPayConfigParam.java

@@ -33,9 +33,6 @@ public class WxPayConfigParam {
     @Schema(description = "认证类型")
     private String authenticationType = "WECHATPAY2-SHA256-RSA2048";
 
-    @Schema(description = "key文件地址类型,oss、local")
-    private String privateKeyType = "";
-
     @Schema(description = "私钥文件地址")
     private String privateKeyPath;