From 111b4cb02c29a289cd64605acdb26c1e3525782e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 3 Sep 2024 06:25:56 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisCustomerUser.java     | 19 ++++++++-
 .../mapper/EmisCustomerUserMapper.xml         | 40 ++++++++++++++++---
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
index de78a8790..cc83abf62 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCustomerUser.java
@@ -31,6 +31,7 @@ import lombok.Data;
 @Data
 public class EmisCustomerUser extends BaseEntity
 {
+
     private static final long serialVersionUID = 1L;
 
     /* id */
@@ -70,7 +71,7 @@ public class EmisCustomerUser extends BaseEntity
     /* 最后登录ip */
     private String loginIp;
     /* 最后登录日期 */
-     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date loginDate;
     /* 称呼 */
     private String nickName;
@@ -108,8 +109,16 @@ public class EmisCustomerUser extends BaseEntity
     private String postCode;
     /* 真实姓名 */
     private String realName;
-    /* 身份证号 */
+    /* 证件号 */
     private String idNo;
+    /* 证件类型 */
+    private String idType;
+    /* id正面 */
+    private String idPic1;
+    /* id反面 */
+    private String idPic2;
+    /* 实名认证状态 */
+    private String idVerifyStatus;
     /* 回款联系人 */
     private String payee;
     /* 销售联系人 */
@@ -124,6 +133,12 @@ public class EmisCustomerUser extends BaseEntity
     private String opEmpCode;
     /* 首次签约 */
     private String firstSigningDay;
+    /* 付款期类型 1-天 2-月 */
+    private String creditPeriodType;
+    /* 付款期 默认10天 */
+    private Integer creditPeriod;
+    /* 账单日 1-31 */
+    private Integer settleDay;
     /* 启用状态 1-启用 0-未启用 */
     private String status;
     /* 排序 */
diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
index 7861081d9..92c9ce487 100644
--- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
@@ -43,6 +43,10 @@
         <result property="postCode"    column="post_code"    />
         <result property="realName"    column="real_name"    />
         <result property="idNo"    column="id_no"    />
+        <result property="idType"    column="id_type"    />
+        <result property="idPic1"    column="id_pic1"    />
+        <result property="idPic2"    column="id_pic2"    />
+        <result property="idVerifyStatus"    column="id_verify_status"    />
         <result property="payee"    column="payee"    />
         <result property="salesmen"    column="salesmen"    />
         <result property="dataFrom"    column="data_from"    />
@@ -50,6 +54,9 @@
         <result property="blSms"    column="bl_sms"    />
         <result property="opEmpCode"    column="op_emp_code"    />
         <result property="firstSigningDay"    column="first_signing_day"    />
+        <result property="creditPeriodType"    column="credit_period_type"    />
+        <result property="creditPeriod"    column="credit_period"    />
+        <result property="settleDay"    column="settle_day"    />
         <result property="status"    column="status"    />
         <result property="orderNum"    column="order_num"    />
 
@@ -84,7 +91,7 @@
 
 
     <sql id="selectEmisCustomerUserVo">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_customer_user
     </sql>
 
 <!--    or FIND_IN_SET(#{ownerSite},biz_site)-->
@@ -154,6 +161,10 @@
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
 
+            <if test="creditPeriodType != null  and creditPeriodType != ''"> and credit_period_type=#{creditPeriodType}</if>
+            <if test="creditPeriod != null "> and credit_period = #{creditPeriod}</if>
+            <if test="settleDay != null "> and settle_day = #{settleDay}</if>
+
             <choose>
                 <when test="payee != null  and payee != '' and salesmen != null  and salesmen != ''">
                     <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
@@ -172,15 +183,14 @@
     </select>
 
     <select id="selectEmisCustomerUserById" parameterType="Long" resultMap="EmisCustomerUserResult">
-        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select id, customer_code, customer_name, customer_name_en, simple_name, contact, phone, mobile, customer_type, settled_type, user_type, company, lic_no, dept_id, avatar, sex, invitation_info, login_ip, login_date, nick_name, union_id, openid, monthly_pay_code, user_name, password, owner_site, biz_site, biz_site_name, country, province, city, county, town, address, email, post_code, real_name, id_no, id_type, id_pic1, id_pic2, id_verify_status, payee, salesmen, data_from, bl_open_oms, bl_sms, op_emp_code, first_signing_day, credit_period_type, credit_period, settle_day, status, order_num, remark, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
         from emis_customer_user a
         where a.id = #{id}
     </select>
 
-    <insert id="insertEmisCustomerUser" parameterType="EmisCustomerUser">
+    <insert id="insertEmisCustomerUser" parameterType="EmisCustomerUser" useGeneratedKeys="true" keyProperty="id">
         insert into emis_customer_user
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
             <if test="customerCode != null and customerCode != ''">customer_code,</if>
             <if test="customerName != null and customerName != ''">customer_name,</if>
             <if test="customerNameEn != null and customerNameEn != ''">customer_name_en,</if>
@@ -218,6 +228,10 @@
             <if test="postCode != null and postCode != ''">post_code,</if>
             <if test="realName != null and realName != ''">real_name,</if>
             <if test="idNo != null and idNo != ''">id_no,</if>
+            <if test="idType != null and idType != ''">id_type,</if>
+            <if test="idPic1 != null and idPic1 != ''">id_pic1,</if>
+            <if test="idPic2 != null and idPic2 != ''">id_pic2,</if>
+            <if test="idVerifyStatus != null and idVerifyStatus != ''">id_verify_status,</if>
             <if test="payee != null and payee != ''">payee,</if>
             <if test="salesmen != null and salesmen != ''">salesmen,</if>
             <if test="dataFrom != null and dataFrom != ''">data_from,</if>
@@ -225,6 +239,9 @@
             <if test="blSms != null and blSms != ''">bl_sms,</if>
             <if test="opEmpCode != null and opEmpCode != ''">op_emp_code,</if>
             <if test="firstSigningDay != null and firstSigningDay != ''">first_signing_day,</if>
+            <if test="creditPeriodType != null and creditPeriodType != ''">credit_period_type,</if>
+            <if test="creditPeriod != null">credit_period,</if>
+            <if test="settleDay != null">settle_day,</if>
             <if test="status != null and status != ''">status,</if>
             <if test="orderNum != null and orderNum != ''">order_num,</if>
             <if test="remark != null and remark != ''">remark,</if>
@@ -237,7 +254,6 @@
             <if test="updateSite != null and updateSite != ''">update_site,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id},</if>
             <if test="customerCode != null and customerCode != ''">#{customerCode},</if>
             <if test="customerName != null and customerName != ''">#{customerName},</if>
             <if test="customerNameEn != null and customerNameEn != ''">#{customerNameEn},</if>
@@ -275,6 +291,10 @@
             <if test="postCode != null and postCode != ''">#{postCode},</if>
             <if test="realName != null and realName != ''">#{realName},</if>
             <if test="idNo != null and idNo != ''">#{idNo},</if>
+            <if test="idType != null and idType != ''">#{idType},</if>
+            <if test="idPic1 != null and idPic1 != ''">#{idPic1},</if>
+            <if test="idPic2 != null and idPic2 != ''">#{idPic2},</if>
+            <if test="idVerifyStatus != null and idVerifyStatus != ''">#{idVerifyStatus},</if>
             <if test="payee != null and payee != ''">#{payee},</if>
             <if test="salesmen != null and salesmen != ''">#{salesmen},</if>
             <if test="dataFrom != null and dataFrom != ''">#{dataFrom},</if>
@@ -282,6 +302,9 @@
             <if test="blSms != null and blSms != ''">#{blSms},</if>
             <if test="opEmpCode != null and opEmpCode != ''">#{opEmpCode},</if>
             <if test="firstSigningDay != null and firstSigningDay != ''">#{firstSigningDay},</if>
+            <if test="creditPeriodType != null and creditPeriodType != ''">#{creditPeriodType},</if>
+            <if test="creditPeriod != null">#{creditPeriod},</if>
+            <if test="settleDay != null">#{settleDay},</if>
             <if test="status != null and status != ''">#{status},</if>
             <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
@@ -335,6 +358,10 @@
             <if test="postCode != null and postCode != ''">post_code = #{postCode},</if>
             <if test="realName != null and realName != ''">real_name = #{realName},</if>
             <if test="idNo != null and idNo != ''">id_no = #{idNo},</if>
+            <if test="idType != null and idType != ''">id_type = #{idType},</if>
+            <if test="idPic1 != null and idPic1 != ''">id_pic1 = #{idPic1},</if>
+            <if test="idPic2 != null and idPic2 != ''">id_pic2 = #{idPic2},</if>
+            <if test="idVerifyStatus != null and idVerifyStatus != ''">id_verify_status = #{idVerifyStatus},</if>
             <if test="payee != null and payee != ''">payee = #{payee},</if>
             <if test="salesmen != null and salesmen != ''">salesmen = #{salesmen},</if>
             <if test="dataFrom != null and dataFrom != ''">data_from = #{dataFrom},</if>
@@ -342,6 +369,9 @@
             <if test="blSms != null and blSms != ''">bl_sms = #{blSms},</if>
             <if test="opEmpCode != null and opEmpCode != ''">op_emp_code = #{opEmpCode},</if>
             <if test="firstSigningDay != null and firstSigningDay != ''">first_signing_day = #{firstSigningDay},</if>
+            <if test="creditPeriodType != null and creditPeriodType != ''">credit_period_type = #{creditPeriodType},</if>
+            <if test="creditPeriod != null">credit_period = #{creditPeriod},</if>
+            <if test="settleDay != null">settle_day = #{settleDay},</if>
             <if test="status != null and status != ''">status = #{status},</if>
             <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>