From 6c40e04eb7c2060feb2533735cd3089d438965e5 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 19 三月 2024 17:19:36 +0800
Subject: [PATCH] 整理
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 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 e5c6889..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
@@ -18,20 +18,17 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
-import com.doumee.dao.admin.response.CarEventDTO;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.MemberCardJoinMapper;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCard;
-import com.doumee.dao.business.model.Retention;
-import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.MemberCardService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.impl.hksync.HkSyncOrgUserServiceImpl;
+import com.doumee.service.business.impl.hksync.ferp.HkSyncOrgUserToHKServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
@@ -41,8 +38,6 @@
import org.springframework.util.CollectionUtils;
import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛⊿ervice瀹炵幇
@@ -71,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(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
@@ -90,7 +88,7 @@
}
CardInfoRequest cr = new CardInfoRequest();
cr.setCardNo(memberCard.getCode());
- cr.setOrgIndexCode(member.getCompanyHkId());
+ cr.setOrgIndexCode(member.getHkOrgId());
cr.setPersonId(member.getHkId());
cr.setCardType(memberCard.getType());
List<CardInfoRequest> cardList = new ArrayList<>();
@@ -100,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();
}
@@ -232,8 +234,22 @@
*/
private void dealMemberRoleEmpower(Member member ) {
//澶勭悊鏂板鐨勪汉鍛樺崱鐗囨暟鎹紙涓庢捣搴峰悓姝ワ級
- List<MemberCard> cards = HkSyncOrgUserServiceImpl.getNormalCardList(member,memberCardMapper);
- HkSyncOrgUserServiceImpl.dealMemberRoleEmpowerDo(cards,member,deviceRoleMapper,empowerMapper,deviceMapper);
+ 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
@@ -289,11 +305,11 @@
queryWrapper.orderByDesc(MemberCard::getCreateDate);
//鏄惁鏄暟瀛�
- boolean number = Validator.isNumber(pageWrap.getModel().getKeyWords());
+ boolean number = Validator.isNumber(pageWrap.getModel().getKeyword());
//鏄惁鍖呭惈涓枃
- boolean b = Validator.hasChinese(pageWrap.getModel().getKeyWords());
+ boolean b = Validator.hasChinese(pageWrap.getModel().getKeyword());
//鏄惁鍖呭惈鑻辨枃
- boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyWords());
+ boolean hasWord = ReUtil.contains(PatternPool.WORD, pageWrap.getModel().getKeyword());
queryWrapper.leftJoin(Member.class,Member::getId,MemberCard::getMemberId)
.leftJoin(Company.class,Company::getId,Member::getCompanyId);
@@ -301,12 +317,14 @@
.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())
- .like(number,Member::getPhone,pageWrap.getModel().getKeyWords())
- .like((b||hasWord),Member::getName,pageWrap.getModel().getKeyWords());
+ . 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);
if(null != memberCardIPage && memberCardIPage.getRecords().size() > 0) {
memberCardIPage.setRecords(getDataPackage(memberCardIPage));
--
Gitblit v1.9.3