From e521fe9f2852dd008f176e462bf8ad3e5267e68f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 23 四月 2024 10:57:08 +0800
Subject: [PATCH] 最新版本
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
index 4ab1ef6..af8d16d 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java
@@ -66,14 +66,17 @@
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(MemberCard memberCard) {
LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(Objects.isNull(memberCard.getMemberId())){
+ if(Objects.isNull(memberCard.getMemberId())
+ || StringUtils.isBlank(memberCard.getCode())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ if(memberCard.getCode().length()<8){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍗″彿闇�瑕佸ぇ浜�8浣�");
}
memberCard.setCreator(userInfo.getId());
memberCard.setCreateDate(new Date());
memberCard.setStatus(Constants.ONE);
- memberCardMapper.insert(memberCard);
- dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
+ memberCard.setIsdeleted(Constants.ZERO);
Member member = memberMapper.selectById(memberCard.getMemberId());
if(Objects.isNull(member)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
@@ -95,6 +98,10 @@
if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE) || response.getData()==null){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
}
+ memberCard.setHkStatus(Constants.ONE);
+ memberCardMapper.insert(memberCard);
+ //鏇存柊鐢ㄦ埛鏉冮檺
+ dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
return memberCard.getId();
}
@@ -230,6 +237,20 @@
List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
}
+ /**
+ * 鏇寸粏浜哄憳鍏ㄩ儴闂ㄧ鏉冮檺
+ * @param
+ */
+ @Override
+ public void dealMemberRoleEmpowerById(Integer memberId ) {
+ //澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
+ Member member = memberMapper.selectById(memberId);
+ if(member==null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ List<MemberCard> cards = HkSyncOrgUserToHKServiceImpl.getNormalCardList(member,memberCardMapper);
+ HkSyncOrgUserToHKServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
+ }
@Override
public PageData<MemberCard> findPage(PageWrap<MemberCard> pageWrap) {
@@ -296,10 +317,12 @@
.selectAs(Member::getName,MemberCard::getMemberName)
.selectAs(Member::getPhone,MemberCard::getMemberPhone)
.selectAs(Member::getType,MemberCard::getMemberType)
- .selectAs(Company::getName,MemberCard::getCompanyName);
+ .selectAs(Company::getName,MemberCard::getCompanyName)
+ .eq(MemberCard::getIsdeleted,Constants.ZERO);
queryWrapper.like(Objects.nonNull(pageWrap.getModel().getCode()),MemberCard::getCode,pageWrap.getModel().getCode())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),MemberCard::getStatus,pageWrap.getModel().getStatus())
+ . eq(Objects.nonNull(pageWrap.getModel().getMemberType()),Member::getType,pageWrap.getModel().getMemberType())
.like(number,Member::getPhone,pageWrap.getModel().getKeyword())
.like((b||hasWord),Member::getName,pageWrap.getModel().getKeyword());
IPage<MemberCard> memberCardIPage = memberCardJoinMapper.selectJoinPage(page, MemberCard.class,queryWrapper);
--
Gitblit v1.9.3