bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java

@@ -15,6 +15,7 @@ public class DeleteDeadLockParam {
     /**
      * 会员编号
      */
+    @NotNull(message = "会员编号不可为空")
     private String memberCode;
 
     /**

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java

@@ -3,8 +3,6 @@ package com.hzs.member.base.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hzs.common.core.constant.msg.MemberMsgConstants;
-import com.hzs.common.core.enums.EDelFlag;
-import com.hzs.common.core.enums.EPlaceDept;
 import com.hzs.common.domain.member.base.CuMember;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.member.account.service.ICuMemberAccountService;
@@ -28,11 +26,7 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMem
 
     @Override
     public List<DeleteDeadLockVO> queryDeleteDeadLockList(String memberCode) {
-        List<DeleteDeadLockVO> deleteDeadLockVOList = baseMapper.queryDeleteDeadLockList(memberCode);
+        return baseMapper.queryDeleteDeadLockList(memberCode);
-        deleteDeadLockVOList.forEach(deleteDeadLockVO -> {
-            deleteDeadLockVO.setPlaceDept(EPlaceDept.getEPlaceDept(Integer.parseInt(deleteDeadLockVO.getPlaceDept())));
-        });
-        return deleteDeadLockVOList;
     }
 
     @Override
@@ -53,7 +47,7 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMem
                     .eq(CuMember::getMemberCode,deleteDeadLockParam.getMemberCode())
                     .set(CuMember::getPkModified,userId)
                     .set(CuMember::getModifiedTime,date)
-                    .set(CuMember::getDelFlag, EDelFlag.DELETE.getValue()));
+                    .set(CuMember::getDelFlag,1));
             // 删除会员账户
             iCuMemberAccountService.deleteCuMemberAccountByMemberCode(userId,date,deleteDeadLockParam.getMemberCode());
         } else {

bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java

@@ -27,7 +27,7 @@ public class DeleteDeadLockVO {
     /**
      * 结算等级
      */
-    private String pkSettleGrade;
+    private Integer pkSettleGrade;
     /**
      * 推荐人编号
      */

bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml

@@ -69,14 +69,14 @@
         <result column="ACCOUNT_STATUS" property="accountStatus"/>
         <result column="PK_COUNTRY" property="pkCountry"/>
     </resultMap>
-    <update id="deleteCuMemberAccountByMemberCode">
+    <delete id="deleteCuMemberAccountByMemberCode">
         update cu_member_account cma
         set cma.del_flag = 1,cma.PK_MODIFIED = #{userId},cma.MODIFIED_TIME = #{date}
         where cma.pk_member in
               (select cm.pk_id
                from cu_member cm
                where cm.member_code = #{memberCode})
-    </update>
+    </delete>
 
     <select id="queryMemberAccountByCondition" resultMap="AccountExResultMap">
         select cm.pay_pwd,

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -3207,7 +3207,7 @@
     <select id="queryDeleteDeadLockList" resultType="com.hzs.member.base.vo.DeleteDeadLockVO">
         SELECT
             cu.MEMBER_CODE,
-        cu.MEMBER_NAME，bdg.GRADE_NAME as pkSettleGrade,
+            cu.MEMBER_NAME，cu.PK_SETTLE_GRADE,
             cus.MEMBER_CODE AS parMemberCode,
             cuss.MEMBER_CODE AS placeMemberCode，cu.PLACE_DEPT,
             cu.CREATION_TIME
@@ -3215,7 +3215,6 @@
             CU_MEMBER cu
                 LEFT JOIN CU_MEMBER cus ON cu.PK_PARENT = cus.PK_ID
                 LEFT JOIN CU_MEMBER cuss ON cu.PK_PLACE_PARENT = cuss.PK_ID
-        LEFT JOIN BD_GRADE bdg ON cu.PK_SETTLE_GRADE = bdg.PK_ID
         WHERE
             cu.DEL_FLAG = 0
             AND cu.CATEGORY = 2