From 0a0ddc2087fa31cafb0589cf5c826f7caef1914e Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Mon, 08 May 2023 11:36:23 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/entity/MallMember.java                       |    2 --
 src/main/resources/templates/febs/views/modules/mallMember/addMember.html      |    6 ------
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java    |    1 -
 src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java                         |    3 ---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java   |    1 -
 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html |    1 -
 6 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
index 3aef9c8..af2af3f 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -405,7 +405,6 @@
         registerDto.setInviteId(member.getInviteId());
         registerDto.setName(member.getName());
         registerDto.setSex(member.getSex());
-        registerDto.setCardNo(member.getCardNo());
         apiMallMemberService.register(registerDto);
         return new FebsResponse().success();
     }
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
index b311f33..405f416 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/RegisterDto.java
@@ -44,7 +44,4 @@
     @ApiModelProperty(hidden = true)
     private String registType;
 
-    @ApiModelProperty(value = "身份证号码")
-    private String cardNo;
-
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index c75e23f..562f1fa 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -176,8 +176,6 @@
 
     private String skin;
 
-    private String cardNo;
-
     public String getLevelName() {
         if (sex != null) {
             return MemberLevelTagDicEnums.getDesc(sex, level);
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index da1331a..ff20ef9 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -116,7 +116,6 @@
         mallMember.setSex(registerDto.getSex());
         mallMember.setBindPhone(registerDto.getAccount());
         mallMember.setSkin("default");
-        mallMember.setCardNo(registerDto.getCardNo());
 
         this.baseMapper.insert(mallMember);
 
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/addMember.html b/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
index 1ae0536..06e1b9e 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/addMember.html
@@ -47,12 +47,6 @@
                 <input type="radio" name="sex" value="2" title="女" />
             </div>
         </div>
-        <div class="layui-form-item">
-            <label class="layui-form-label febs-form-item-require">身份证号码:</label>
-            <div class="layui-input-block">
-                <input type="text" name="cardNo" lay-verify="required" autocomplete="off" class="layui-input">
-            </div>
-        </div>
         <div class="layui-form-item febs-hide">
             <button class="layui-btn" lay-submit="" lay-filter="member-add-form-submit" id="submit"></button>
         </div>
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index a754c6f..4483a56 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -229,7 +229,6 @@
                     {type: 'checkbox'},
                     {field: 'phone', title: '账号', minWidth: 150,align:'left'},
                     {field: 'name', title: '名称', minWidth: 100,align:'left', totalRowText: '合计:'},
-                    {field: 'cardNo', title: '身份证号码', minWidth: 100,align:'left', totalRowText: '合计:'},
                     {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                     {field: 'balance', title: '余额', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.balance) }}'},
                     {field: 'prizeScore', title: '现金积分', minWidth: 100,align:'left',totalRow: '{{= parseInt(d.prizeScore) }}'},

--
Gitblit v1.9.1