7 changed files with 38 additions and 46 deletions
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/DeleteDeadLockController.java
@ -1,9 +1,6 @@
 package com.hzs.member.base.controller.manage;


-import com.hzs.common.core.annotation.Log;
-import com.hzs.common.core.enums.EOperationMethod;
-import com.hzs.common.core.enums.EOperationModule;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.core.web.page.TableDataInfo;
@ -12,7 +9,10 @@ import com.hzs.member.base.param.DeleteDeadLockParam;
 import com.hzs.member.base.service.DeleteDeadLockService;
 import com.hzs.member.base.vo.DeleteDeadLockVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;

 import java.util.List;

@ -26,7 +26,6 @@ public class DeleteDeadLockController extends BaseController {
    /**
     * 删除死点列表
     */
-    @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.SELECT)
    @GetMapping("list")
    public TableDataInfo list(DeleteDeadLockParam deleteDeadLockParam) {
        startPage();
@ -38,9 +37,8 @@ public class DeleteDeadLockController extends BaseController {
    /**
     * 删除死点
     */
-    @Log(module = EOperationModule.DELETE_DEAD_LOCK, method = EOperationMethod.DELETE)
    @PostMapping("delete")
-    public AjaxResult delete(@RequestBody DeleteDeadLockParam deleteDeadLockParam) {
+    public AjaxResult delete(DeleteDeadLockParam deleteDeadLockParam) {
        String check = deleteDeadLockService.deleteDeadLockMember(deleteDeadLockParam);
        if (check == null) {
            return AjaxResult.success();
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/param/DeleteDeadLockParam.java
+++ b/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;

    /**
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/DeleteDeadLockServiceImpl.java
+++ b/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;
@ -12,7 +10,6 @@ import com.hzs.member.base.mapper.CuMemberMapper;
 import com.hzs.member.base.param.DeleteDeadLockParam;
 import com.hzs.member.base.service.DeleteDeadLockService;
 import com.hzs.member.base.vo.DeleteDeadLockVO;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@ -21,18 +18,13 @@ import java.util.Date;
 import java.util.List;

@Service
-@Slf4j
 public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> implements DeleteDeadLockService {
    @Autowired
    private ICuMemberAccountService iCuMemberAccountService;

    @Override
    public List<DeleteDeadLockVO> queryDeleteDeadLockList(String memberCode) {
-        List<DeleteDeadLockVO> deleteDeadLockVOList = baseMapper.queryDeleteDeadLockList(memberCode);
-        deleteDeadLockVOList.forEach(deleteDeadLockVO -> {
-            deleteDeadLockVO.setPlaceDept(EPlaceDept.getEPlaceDept(Integer.parseInt(deleteDeadLockVO.getPlaceDept())));
-        });
-        return deleteDeadLockVOList;
+        return baseMapper.queryDeleteDeadLockList(memberCode);
    }

    @Override
@ -43,7 +35,6 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMem
        }
        // 查询安置伞下和推荐伞下未删除会员数量,如果未删除会员数量为0返回true
        Integer isNoDeadNum = baseMapper.queryIsDeadMember(deleteDeadLockParam.getMemberCode());
-        log.info("安置伞下和推荐伞下未删除会员数量:{}",isNoDeadNum);
        if(isNoDeadNum == 0){
            // 删除操作
            Long userId = SecurityUtils.getUserId();
@ -53,7 +44,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));
+                    .set(CuMember::getDelFlag,1));
            // 删除会员账户
            iCuMemberAccountService.deleteCuMemberAccountByMemberCode(userId,date,deleteDeadLockParam.getMemberCode());
        } else {
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/vo/DeleteDeadLockVO.java
+++ b/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;
    /**
     * 推荐人编号
     */
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/account/CuMemberAccountMapper.xml
+++ b/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,
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml
+++ b/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,11 +3215,10 @@
            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
-        <if test="memberCode != null and memberCode != ''">
+        <if test="memberCode != null">
            AND cu.MEMBER_CODE = #{memberCode}
        </if>
    </select>
@ -3231,18 +3230,23 @@
                SELECT
                    MEMBER_CODE
                FROM
-                    CU_MEMBER
-                WHERE
-                    DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PARENT UNION ALL
+                    (
                        SELECT
                            MEMBER_CODE
                        FROM
-                    CU_MEMBER
-                WHERE
-                    DEL_FLAG = 0 START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT
+                            CU_MEMBER START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PARENT
+                                                                                    AND MEMBER_CODE = #{memberCode}
+                                                                                    AND DEL_FLAG = 0 UNION
+                        SELECT
+                            MEMBER_CODE
+                        FROM
+                            CU_MEMBER START WITH MEMBER_CODE = #{memberCode} CONNECT BY PRIOR PK_ID = PK_PLACE_PARENT
+                                                                                    AND MEMBER_CODE = #{memberCode}
+                                                                                    AND DEL_FLAG = 0
                    ) t
                WHERE
                    t.MEMBER_CODE != #{memberCode}
+            )
    </select>


--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EOperationModule.java
@ -357,8 +357,6 @@ public enum EOperationModule {

    CANCEL_ORDER_CONFIRM("撤销订单确认"),

-    DELETE_DEAD_LOCK("删除死点"),
-
    ///////////////////////////统计分析////////////////////////////

    STATISTIC_ANALYSIS("统计分析"),