添加商户字段

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禁入")
+    /**  是否开启余额监控 0否 1是 */
-    private Integer channelLimitType;
+    @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;

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/MerchantMapper.xml

@@ -14,7 +14,14 @@
         <result property="status"    column="status"    />
         <result property="limitNum"    column="limit_num"    />
         <result property="limitType"    column="limit_type"    />
+        <result property="isBalanceMonitoring"    column="is_balance_monitoring"    />
+        <result property="balanceMonitoring"    column="balance_monitoring"    />
+        <result property="ispass"    column="ispass"    />
+        <result property="customerInfoFilterType"    column="customer_info_filter_type"    />
         <result property="channelLimitType"    column="channel_limit_type"    />
+        <result property="period"    column="period"    />
+        <result property="hitUrl"    column="hit_url"    />
+        <result property="registUrl"    column="regist_url"    />
         <result property="ageLimitStart"    column="age_limit_start"    />
         <result property="ageLimitEnd"    column="age_limit_end"    />
         <result property="phoneLimit"    column="phone_limit"    />
@@ -60,7 +67,7 @@
         <result property="merchantName"    column="merchant_name"    />
     </resultMap>
     <sql id="selectMerchantVo">
-        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
     </sql>
     <sql id="findAllMerchant">
         select id, merchant_name  from merchant
@@ -77,7 +84,14 @@
             <if test="status != null "> and status = #{status}</if>
             <if test="limitNum != null  and limitNum != ''"> and limit_num = #{limitNum}</if>
             <if test="limitType != null "> and limit_type = #{limitType}</if>
+            <if test="isBalanceMonitoring != null "> and is_balance_monitoring = #{isBalanceMonitoring}</if>
+            <if test="balanceMonitoring  != null "> and balance_monitoring = #{balanceMonitoring}</if>
+            <if test="ispass != null "> and ispass = #{ispass}</if>
+            <if test="customerInfoFilterType != null "> and customer_info_filter_type = #{customerInfoFilterType}</if>
             <if test="channelLimitType != null "> and channel_limit_type = #{channelLimitType}</if>
+            <if test="period != null "> and period = #{period}</if>
+            <if test="hitUrl != null "> and hit_url = #{hitUrl}</if>
+            <if test="registUrl != null "> and regist_url = #{registUrl}</if>
             <if test="ageLimitStart != null "> and age_limit_start = #{ageLimitStart}</if>
             <if test="ageLimitEnd != null "> and age_limit_end = #{ageLimitEnd}</if>
             <if test="phoneLimit != null  and phoneLimit != ''"> and phone_limit = #{phoneLimit}</if>
@@ -132,7 +146,14 @@
             <if test="status != null">status,</if>
             <if test="limitNum != null">limit_num,</if>
             <if test="limitType != null">limit_type,</if>
+            <if test="isBalanceMonitoring != null">is_balance_monitoring,</if>
+            <if test="balanceMonitoring != null">balance_monitoring,</if>
+            <if test="ispass != null">ispass,</if>
+            <if test="customerInfoFilterType != null">customer_info_filter_type,</if>
             <if test="channelLimitType != null">channel_limit_type,</if>
+            <if test="period != null">period,</if>
+            <if test="hitUrl != null">hit_url,</if>
+            <if test="registUrl != null">regist_url,</if>
             <if test="ageLimitStart != null">age_limit_start,</if>
             <if test="ageLimitEnd != null">age_limit_end,</if>
             <if test="phoneLimit != null">phone_limit,</if>
@@ -181,7 +202,14 @@
             <if test="status != null">#{status},</if>
             <if test="limitNum != null">#{limitNum},</if>
             <if test="limitType != null">#{limitType},</if>
+            <if test="isBalanceMonitoring != null">#{isBalanceMonitoring},</if>
+            <if test="balanceMonitoring != null">#{balanceMonitoring},</if>
+            <if test="ispass != null">#{ispass},</if>
+            <if test="customerInfoFilterType != null">#{customerInfoFilterType},</if>
             <if test="channelLimitType != null">#{channelLimitType},</if>
+            <if test="period != null">#{period},</if>
+            <if test="hitUrl != null">#{hitUrl},</if>
+            <if test="registUrl != null">#{registUrl},</if>
             <if test="ageLimitStart != null">#{ageLimitStart},</if>
             <if test="ageLimitEnd != null">#{ageLimitEnd},</if>
             <if test="phoneLimit != null">#{phoneLimit},</if>
@@ -234,7 +262,14 @@
             <if test="status != null">status = #{status},</if>
             <if test="limitNum != null">limit_num = #{limitNum},</if>
             <if test="limitType != null">limit_type = #{limitType},</if>
+            <if test="isBalanceMonitoring != null">is_balance_monitoring = #{isBalanceMonitoring},</if>
+            <if test="balanceMonitoring != null">balance_monitoring = #{balanceMonitoring},</if>
+            <if test="ispass != null">ispass = #{ispass},</if>
+            <if test="customerInfoFilterType != null">customer_info_filter_type = #{customerInfoFilterType},</if>
             <if test="channelLimitType != null">channel_limit_type = #{channelLimitType},</if>
+            <if test="period != null">period = #{period},</if>
+            <if test="hitUrl != null">hit_url = #{hitUrl},</if>
+            <if test="registUrl != null">regist_url = #{registUrl},</if>
             <if test="ageLimitStart != null">age_limit_start = #{ageLimitStart},</if>
             <if test="ageLimitEnd != null">age_limit_end = #{ageLimitEnd},</if>
             <if test="phoneLimit != null">phone_limit = #{phoneLimit},</if>