angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lx_dev' into lx_dev

This commit is contained in:
cabbage 2025-09-16 09:30:20 +08:00
parent c90a1942b9 4c87af4adf
commit c352272e7a
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -4,6 +4,7 @@ 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;
@ -27,7 +28,11 @@ public class DeleteDeadLockServiceImpl extends ServiceImpl<CuMemberMapper, CuMem
@Override
public List<DeleteDeadLockVO> queryDeleteDeadLockList(String memberCode) {
return baseMapper.queryDeleteDeadLockList(memberCode);
List<DeleteDeadLockVO> deleteDeadLockVOList = baseMapper.queryDeleteDeadLockList(memberCode);
deleteDeadLockVOList.forEach(deleteDeadLockVO -> {
deleteDeadLockVO.setPlaceDept(EPlaceDept.getEPlaceDept(Integer.parseInt(deleteDeadLockVO.getPlaceDept())));
});
return deleteDeadLockVOList;
}
@Override
@ -48,7 +53,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, EDelFlag.DELETE.getValue()));
// 删除会员账户
iCuMemberAccountService.deleteCuMemberAccountByMemberCode(userId,date,deleteDeadLockParam.getMemberCode());
} else {

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

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

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

@ -3194,7 +3194,7 @@
<select id="queryDeleteDeadLockList" resultType="com.hzs.member.base.vo.DeleteDeadLockVO">
SELECT
cu.MEMBER_CODE,
cu.MEMBER_NAME，cu.PK_SETTLE_GRADE,
cu.MEMBER_NAME，bdg.GRADE_NAME as pkSettleGrade,
cus.MEMBER_CODE AS parMemberCode,
cuss.MEMBER_CODE AS placeMemberCode，cu.PLACE_DEPT,
cu.CREATION_TIME
@ -3202,6 +3202,7 @@
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