From 515cfe869fe297cee6fc86d7913724fd9d822341 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 28 Mar 2023 11:08:32 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8E=E7=AE=A1=E9=89=B4=E6=9D=83?=
 =?UTF-8?q?=E5=8D=A1=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PileAuthCardServiceImpl.java | 20 +++++++++++++------
 .../mapper/pile/PileAuthCardMapper.xml        |  4 ++--
 jsowell-ui/src/views/pile/card/index.vue      | 14 +++++++++++++
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
index 132cb63fb..92ebc5eb2 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java
@@ -96,16 +96,23 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
      */
     @Override
     public int insertPileAuthCardForWeb(PileAuthCardDTO dto) {
-        // 通过手机号查询memberId
-        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber());
-        if (memberBasicInfo == null) {
-            // 为空则说明未查到该用户的注册信息
-            throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
+        MemberBasicInfo memberBasicInfo = new MemberBasicInfo();
+        if (dto.getPhoneNumber() == null) {
+            memberBasicInfo.setMemberId(null);
+            memberBasicInfo.setStatus("0"); // 0-待激活
+        }else {
+            // 通过手机号查询memberId
+            memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber());
+            if (memberBasicInfo == null) {
+                // 为空则说明未查到该用户的注册信息
+                throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
+            }
+            memberBasicInfo.setStatus("1"); // 1-正常使用
         }
         PileAuthCard pileAuthCard = PileAuthCard.builder()
                 .logicCard(dto.getLogicCard())
                 .memberId(memberBasicInfo.getMemberId())
-                .status("1")
+                .status(memberBasicInfo.getStatus())
                 .build();
         return pileAuthCardMapper.insertPileAuthCard(pileAuthCard);
     }
@@ -133,6 +140,7 @@ public class PileAuthCardServiceImpl implements IPileAuthCardService {
                 .id(dto.getId())
                 .logicCard(dto.getLogicCard())
                 .memberId(memberBasicInfo.getMemberId())
+                .status(dto.getStatus())
                 .build();
         return pileAuthCardMapper.updatePileAuthCard(pileAuthCard);
     }
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
index c79708139..359dbd713 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml
@@ -51,7 +51,7 @@
             t2.mobile_number as phoneNumber,
             t2.nick_name as nickName
         from pile_auth_card t1
-            join member_basic_info t2 on t1.member_id = t2.member_id
+            left join member_basic_info t2 on t1.member_id = t2.member_id
         where t1.del_flag = '0'
         and t1.id = #{id}
     </select>
@@ -144,7 +144,7 @@
             t2.mobile_number as phoneNumber,
             t2.nick_name as nickName
         from pile_auth_card t1
-            join member_basic_info t2 on t1.member_id = t2.member_id
+            left join member_basic_info t2 on t1.member_id = t2.member_id
         where t1.del_flag = '0'
         <if test="logicCard != null  and logicCard != ''"> and t1.logic_card = #{logicCard}</if>
         <if test="physicsCard != null  and physicsCard != ''"> and t1.physics_card = #{physicsCard}</if>
diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue
index 318af82e4..8a356600d 100644
--- a/jsowell-ui/src/views/pile/card/index.vue
+++ b/jsowell-ui/src/views/pile/card/index.vue
@@ -137,6 +137,20 @@
         <el-form-item label="手机号码" prop="phoneNumber">
           <el-input v-model="form.phoneNumber" placeholder="请输入会员的手机号码" />
         </el-form-item>
+        <el-form-item label="选择状态" prop="status">
+          <el-select
+            placeholder="请选择状态"
+            v-model="form.status"
+          >
+            <el-option
+              v-for="item in dict.type.card_status"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
 <!--        <el-form-item label="物理卡号" prop="physicsCard">-->
 <!--          <el-input v-model="form.physicsCard" placeholder="请输入物理卡号" />-->
 <!--        </el-form-item>-->