cs

src/main/java/com/github/microservice/models/hxz/ConsumTransactionsFullParam.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/models/hxz/ConsumTransactionsFullResult.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/models/hxz/ConsumTransactionsModel.java

@@ -2,7 +2,7 @@ package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.github.microservice.models.type.OrderFromType;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/models/hxz/QRCodeTransactionFullResult.java

@@ -1,7 +1,6 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.hxz.base.HxzBaseResult;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/models/hxz/QRCodeTransactionModel.java

@@ -1,7 +1,7 @@
 package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/pay/params/BasePayParam.java

@@ -1,6 +1,6 @@
 package com.github.microservice.pay.params;
 
-import com.github.microservice.models.type.PaymentType;
+import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/types/payment/PaymentChannelType.java

@@ -0,0 +1,20 @@
+package com.github.microservice.types.payment;
+
+import lombok.Getter;
+
+/**
+ * 项目 配置的支付渠道
+ */
+public enum PaymentChannelType {
+    SecretFreePayment("免密支付"),
+    BalancePayment("余额支付"),
+    DirectPayment("直营支付"),
+    ;
+
+    @Getter
+    private String remark;
+
+    PaymentChannelType(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/github/microservice/models/type/PaymentDeviceType.java → src/main/java/com/github/microservice/types/payment/PaymentDeviceType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.payment;
 
 import lombok.Getter;
 

src/main/java/com/github/microservice/models/type/PaymentType.java → src/main/java/com/github/microservice/types/payment/PaymentType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.payment;
 
 import lombok.Getter;
 
@@ -12,7 +12,6 @@ public enum PaymentType {
     QrCode("微信支付", false, ""),
     WxQrCode("微信付款码支付", false, ""),
     ZfbQrCode("支付宝付款码支付", false, ""),
-    Uni("银联", false, ""),
     ;
 
     @Getter