TRX vor 1 Jahr
Ursprung
Commit
0d3f00da7b

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

@@ -66,6 +66,9 @@ public class FrictionlessUnionConfigModel {
     @Schema(description = "悦融益提现 系统编号")
     private String withdrawSysid = "";
 
+    @Schema(description = "提现商户号")
+    private String withdrawMid = "";
+
     @Schema(description = "悦融益提现 多应用类型")
     private String withdrawAppType = "74";
 

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

@@ -63,6 +63,9 @@ public class FrictionlessUnionConfigParam extends PayConfigParam {
     @Schema(description = "悦融益提现 系统编号")
     private String withdrawSysid = "";
 
+    @Schema(description = "提现商户号")
+    private String withdrawMid = "";
+
     @Schema(description = "悦融益提现 多应用类型")
     private String withdrawAppType = "74";
 

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

@@ -7,6 +7,9 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 支付参数字段
  *
@@ -36,4 +39,8 @@ public class PayConfigField {
 
     @Schema(description = "最大长度")
     private Integer maxLength = 500;
+
+    @Schema(description = "关联判断的")
+    private PayShowField payShowField;
+
 }

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

@@ -49,7 +49,4 @@ public class PayConfigParam {
     @Schema(description = "是否可用")
     private DataState state;
 
-//    @Schema(description = "上层的数据ID")
-//    private String projectPaySettingId;
-
 }

+ 32 - 0
FullCardClient/src/main/java/com/zhongshu/card/client/model/paySetting/paySetting/PayShowField.java

@@ -0,0 +1,32 @@
+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.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 支付参数字段
+ *
+ * @author TRX
+ * @date 2024/10/22
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class PayShowField {
+    @Schema(description = "字段名称,如:名称,appId")
+    private String name;
+
+    @Schema(description = "字段类型,如:Str, File")
+    private PayFieldType type;
+
+    @Schema(description = "可显示的条件")
+    private List<Object> showAccount = new ArrayList<>();
+}

+ 22 - 7
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/paySetting/ProjectPaySettingServiceImpl.java

@@ -519,15 +519,30 @@ public class ProjectPaySettingServiceImpl extends SuperService {
      */
     public List<PayConfigField> getUnionPay() {
         List<PayConfigField> fields = new ArrayList<>(4);
-        fields.add(PayConfigField.builder().name("appId").key("appId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
-        fields.add(PayConfigField.builder().name("appKey").key("appKey").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
-        fields.add(PayConfigField.builder().name("商户订单号开头").key("orderStart").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
-        fields.add(PayConfigField.builder().name("终端号").key("tid").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
+
+        List<Object> showMainAccount = new ArrayList<>();
+        showMainAccount.add(Boolean.TRUE);
+        PayShowField mainFiled = new PayShowField();
+        mainFiled.setName("isDefault");
+        mainFiled.setType(PayFieldType.Bool);
+        mainFiled.setShowAccount(showMainAccount);
+
+        fields.add(PayConfigField.builder().name("appId").key("appId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).payShowField(mainFiled).build());
+        fields.add(PayConfigField.builder().name("appKey").key("appKey").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).payShowField(mainFiled).build());
+        fields.add(PayConfigField.builder().name("商户订单号开头").key("orderStart").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).payShowField(mainFiled).build());
+        fields.add(PayConfigField.builder().name("终端号").key("tid").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).payShowField(mainFiled).build());
         fields.add(PayConfigField.builder().name("协议模板id").key("planId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
-        fields.add(PayConfigField.builder().name("密钥").key("notifySecret").type(PayFieldType.Str).isMust(Boolean.TRUE).build());
+        fields.add(PayConfigField.builder().name("密钥").key("notifySecret").type(PayFieldType.Str).isMust(Boolean.TRUE).payShowField(mainFiled).build());
+
+        fields.add(PayConfigField.builder().name("通知地址").key("notifyUrl").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(500).payShowField(mainFiled).build());
 
-//        fields.add(PayConfigField.builder().name("商户微信小程序AppId").key("mchntWxMpAppId").type(PayFieldType.Str).isMust(Boolean.TRUE).build());
-        fields.add(PayConfigField.builder().name("通知地址").key("notifyUrl").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(500).build());
+        // 提现
+        fields.add(PayConfigField.builder().name("提现AppId").key("withdrawAppId").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).payShowField(mainFiled).build());
+        fields.add(PayConfigField.builder().name("提现AppKey").key("withdrawAppKey").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).payShowField(mainFiled).build());
+        fields.add(PayConfigField.builder().name("SysId").key("withdrawSysid").type(PayFieldType.Str).isMust(Boolean.TRUE).payShowField(mainFiled).build());
+        fields.add(PayConfigField.builder().name("提现商户号").key("withdrawMid").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).build());
+        fields.add(PayConfigField.builder().name("多应用类型").key("withdrawAppType").type(PayFieldType.Str).isMust(Boolean.TRUE).maxLength(100).payShowField(mainFiled).build());
+        fields.add(PayConfigField.builder().name("提现通知地址").key("withdrawNotify").type(PayFieldType.Str).isMust(Boolean.FALSE).payShowField(mainFiled).build());
 
         return fields;
     }