From 4fe409b739edba7c3361ab2f5f00b679e4bedf14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=BD=AD?= Date: Sun, 22 Sep 2024 01:17:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E6=88=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain/http/Merchant.java | 35 +++++++++++++++--- .../mapper/system/MerchantMapper.xml | 37 ++++++++++++++++++- 2 files changed, 65 insertions(+), 7 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java index 607b7da4..a0b0fb0d 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/http/Merchant.java @@ -51,25 +51,48 @@ public class Merchant extends BaseEntity @Excel(name = "定量数") private Integer limitNum; - /**注册地址**/ - private String hitUrl; - /** 是否定量 0否 1是 */ @Excel(name = "是否定量 0否 1是") private Integer limitType; - /** 渠道限制类型 0不限 1准入 2禁入 */ - @Excel(name = "渠道限制类型 0不限 1准入 2禁入") - private Integer channelLimitType; + + /** 是否开启余额监控 0否 1是 */ + @Excel(name = " 是否开启余额监控 0否 1是") + private Integer isBalanceMonitoring; + + /** 余额监控余额 */ + @Excel(name = "余额") + private Integer balanceMonitoring ; + /** 渠道限制ID */ @Excel(name = "渠道限制ID") private String channelLimit; + /** 是否通过 0否 1是 */ + @Excel(name = "是否通过 0否 1是") + private Integer ispass; + /** 渠道限制类型 0不限 1满足其一 2满足全部 */ @Excel(name = "渠道限制类型 0不限 1满足其一 2满足全部") private Integer customerInfoFilterType; + /** 渠道限制类型 0不限 1准入 2禁入 */ + @Excel(name = "渠道限制类型 0不限 1准入 2禁入") + private Integer channelLimitType; + + /** 执行时段 */ + @Excel(name = "执行时段") + private String period; + + /**撞库地址**/ + @Excel(name = "撞库地址") + private String hitUrl; + + /**注册地址**/ + @Excel(name = "注册地址") + private String registUrl; + /** 年龄限制开始 */ @Excel(name = "年龄限制开始") private Integer ageLimitStart; diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml index cae16013..e113672b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml @@ -14,7 +14,14 @@ + + + + + + + @@ -60,7 +67,7 @@ - select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type, channel_limit_type, age_limit_start, age_limit_end, phone_limit,label, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant + select id, merchant_type, merchant_name, merchant_describe, merchant_company, logo, status, limit_num, limit_type,is_balance_monitoring,balance_monitoring,ispass, customer_info_filter_type,channel_limit_type,period,hit_url,regist_url,age_limit_start, age_limit_end, phone_limit,label, social_security_no, social_security_low, social_security_high, car_no, car_have, guarantee_slip_low, guarantee_slip_centre, guarantee_slip_high, education_middle, education_high_school, education_polytechnic, education_junior_college, education_undergraduate_course, education_postgraduate, accumulation_fund_low, accumulation_fund_high, hourse_no, hourse_full_payment, hourse_mortgaging, office_worker, civil_servant, private_property_owners, self_employed_person, other_occupations, hua_bei_low, hua_bei_middle, hua_bei_high, bai_tiao_low, bai_tiao_middle, bai_tiao_high, zhi_ma, create_time, update_time, remark from merchant select id, merchant_name from merchant @@ -77,7 +84,14 @@ and status = #{status} and limit_num = #{limitNum} and limit_type = #{limitType} + and is_balance_monitoring = #{isBalanceMonitoring} + and balance_monitoring = #{balanceMonitoring} + and ispass = #{ispass} + and customer_info_filter_type = #{customerInfoFilterType} and channel_limit_type = #{channelLimitType} + and period = #{period} + and hit_url = #{hitUrl} + and regist_url = #{registUrl} and age_limit_start = #{ageLimitStart} and age_limit_end = #{ageLimitEnd} and phone_limit = #{phoneLimit} @@ -132,7 +146,14 @@ status, limit_num, limit_type, + is_balance_monitoring, + balance_monitoring, + ispass, + customer_info_filter_type, channel_limit_type, + period, + hit_url, + regist_url, age_limit_start, age_limit_end, phone_limit, @@ -181,7 +202,14 @@ #{status}, #{limitNum}, #{limitType}, + #{isBalanceMonitoring}, + #{balanceMonitoring}, + #{ispass}, + #{customerInfoFilterType}, #{channelLimitType}, + #{period}, + #{hitUrl}, + #{registUrl}, #{ageLimitStart}, #{ageLimitEnd}, #{phoneLimit}, @@ -234,7 +262,14 @@ status = #{status}, limit_num = #{limitNum}, limit_type = #{limitType}, + is_balance_monitoring = #{isBalanceMonitoring}, + balance_monitoring = #{balanceMonitoring}, + ispass = #{ispass}, + customer_info_filter_type = #{customerInfoFilterType}, channel_limit_type = #{channelLimitType}, + period = #{period}, + hit_url = #{hitUrl}, + regist_url = #{registUrl}, age_limit_start = #{ageLimitStart}, age_limit_end = #{ageLimitEnd}, phone_limit = #{phoneLimit},