From 410c149120d2d23745f95e08bc75a50a732e6d21 Mon Sep 17 00:00:00 2001
From: gxwebsoft <Websoft5386339>
Date: Mon, 3 Jun 2024 10:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E6=8E=A5=E5=8F=A3(?=
 =?UTF-8?q?=E6=97=A0=E9=9C=80=E6=9D=83=E9=99=90)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gxwebsoft/common/system/entity/Payment.java    | 3 +++
 .../gxwebsoft/common/system/mapper/xml/PaymentMapper.xml    | 3 +++
 .../com/gxwebsoft/common/system/param/PaymentParam.java     | 6 +++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Payment.java b/src/main/java/com/gxwebsoft/common/system/entity/Payment.java
index edb2bb8..478d78e 100644
--- a/src/main/java/com/gxwebsoft/common/system/entity/Payment.java
+++ b/src/main/java/com/gxwebsoft/common/system/entity/Payment.java
@@ -33,6 +33,9 @@ public class Payment implements Serializable {
     @ApiModelProperty(value = "支付方式")
     private String name;
 
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
     @ApiModelProperty(value = "标识")
     private String code;
 
diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/PaymentMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/PaymentMapper.xml
index b215ece..20ab037 100644
--- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/PaymentMapper.xml
+++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/PaymentMapper.xml
@@ -13,6 +13,9 @@
             <if test="param.name != null">
                 AND a.name LIKE CONCAT('%', #{param.name}, '%')
             </if>
+            <if test="param.type != null">
+              AND a.type = #{param.type}
+            </if>
             <if test="param.code != null">
                 AND a.code = #{param.code}
             </if>
diff --git a/src/main/java/com/gxwebsoft/common/system/param/PaymentParam.java b/src/main/java/com/gxwebsoft/common/system/param/PaymentParam.java
index 8e29f09..c0ea022 100644
--- a/src/main/java/com/gxwebsoft/common/system/param/PaymentParam.java
+++ b/src/main/java/com/gxwebsoft/common/system/param/PaymentParam.java
@@ -29,9 +29,13 @@ public class PaymentParam extends BaseParam {
     @ApiModelProperty(value = "支付方式")
     private String name;
 
+    @ApiModelProperty(value = "类型")
+    @QueryField(type = QueryType.EQ)
+    private Integer type;
+
     @ApiModelProperty(value = "标识")
     @QueryField(type = QueryType.EQ)
-    private Integer code;
+    private String code;
 
     @ApiModelProperty(value = "微信商户号类型 1普通商户2子商户")
     @QueryField(type = QueryType.EQ)