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 @@ AND a.name LIKE CONCAT('%', #{param.name}, '%') + + AND a.type = #{param.type} + AND a.code = #{param.code} 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)