From 6765787baa5e0b771d71f865c4deb776367410c4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 13:38:19 +0800
Subject: [PATCH] 修复bug
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java | 150 +++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 130 insertions(+), 20 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 5508be2..8ccdc3d 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
@@ -3,38 +3,41 @@
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.ReUtil;
+import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
+import com.doumee.core.haikang.model.param.request.CardBingdingRequest;
import com.doumee.core.haikang.model.param.request.CardDeletionRequest;
+import com.doumee.core.haikang.model.param.request.CardInfoRequest;
+import com.doumee.core.haikang.model.param.request.CardLossRequest;
import com.doumee.core.haikang.service.HKService;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 鐢ㄦ埛鍗＄墖缁戝畾淇℃伅琛⊿ervice瀹炵幇
@@ -60,9 +63,45 @@
private MemberCardJoinMapper memberCardJoinMapper;
@Override
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer create(MemberCard memberCard) {
+ LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ 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);
+ memberCard.setIsdeleted(Constants.ZERO);
+ Member member = memberMapper.selectById(memberCard.getMemberId());
+ if(Objects.isNull(member)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
+ }
+ CardBingdingRequest param = new CardBingdingRequest();
+ if(member.getStartTime() !=null && member.getEndTime()!=null){
+ param.setStartDate(DateUtil.getShortTime(member.getStartTime()));
+ param.setEndDate(DateUtil.getShortTime(member.getEndTime()));
+ }
+ CardInfoRequest cr = new CardInfoRequest();
+ cr.setCardNo(memberCard.getCode());
+ cr.setOrgIndexCode(member.getHkOrgId());
+ cr.setPersonId(member.getHkId());
+ cr.setCardType(memberCard.getType());
+ List<CardInfoRequest> cardList = new ArrayList<>();
+ cardList.add(cr);
+ param.setCardList(cardList);
+ BaseResponse response = HKService.cardBingding(param);
+ 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();
}
@@ -90,25 +129,80 @@
memberCardMapper.updateById(memberCard);
}
+
+ /**
+ * 鎵归噺鎸傚け/瑙ｆ寕
+ * @param memberCards 瀹炰綋闆�
+ * @param type 0=鎸傚け锛�1=瑙ｆ寕
+ */
@Override
- public void updateByIdInBatch(List<MemberCard> memberCards) {
+ @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+ public void updateByIdInBatch(List<MemberCard> memberCards,Integer type) {
+ LoginUserInfo userInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if (CollectionUtils.isEmpty(memberCards)) {
return;
}
+ CardLossRequest param = new CardLossRequest();
+ List<CardDeletionRequest> cardList = new ArrayList();
for (MemberCard memberCard: memberCards) {
+ MemberCard model = memberCardMapper.selectById(memberCard.getId());
+ if(type.equals(Constants.ZERO)){
+ //鎸傚け鎿嶄綔
+ if(!model.getStatus().equals(Constants.MemberCard.normal)){
+ continue;
+ }
+ }else{
+ //瑙ｆ寕鎿嶄綔
+ if(!model.getStatus().equals(Constants.MemberCard.loss)){
+ continue;
+ }
+ }
+ CardDeletionRequest cardDeletionRequest = this.dealCardData(model);
+ memberCard.setEditDate(new Date());
+ memberCard.setEditor(userInfo.getId());
this.updateById(memberCard);
+ cardList.add(cardDeletionRequest);
+ param.setCardList(cardList);
}
+ BaseResponse response = new BaseResponse();
+ if(type.equals(Constants.ZERO)){
+ response = HKService.cardLoss(param);
+ }else{
+ response = HKService.cardUnLoss(param);
+ }
+ if(response==null
+ ||!StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
+ }
+
}
+
+ public CardDeletionRequest dealCardData(MemberCard model){
+ if(model.getType().equals(Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍗″彿锛�" +model.getCode() + " 涓鸿櫄鎷熷崱鏃犳硶杩涜璇ユ搷浣�");
+ }
+ Member member = memberMapper.selectById(model.getMemberId());
+ if(Objects.isNull(member)||Objects.isNull(member.getHkId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鍗″彿锛�" +model.getCode() + " 瀵瑰簲浜哄憳娴峰悍淇℃伅寮傚父");
+ }
+ dealMemberRoleEmpower(member);
+ CardDeletionRequest cardDeletionRequest = new CardDeletionRequest();
+ cardDeletionRequest.setCardNumber(model.getCode());
+ cardDeletionRequest.setPersonId(member.getHkId());
+ return cardDeletionRequest;
+
+ }
+
+
@Override
@Transactional(rollbackFor = {Exception.class, BusinessException.class})
public void updateRefundCard(MemberCard memberCard) {
MemberCard model = memberCardMapper.selectById(memberCard.getId());
+ CardDeletionRequest cardDeletionRequest = this.dealCardData(model);
memberCardMapper.updateById(memberCard);
- dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
-
- BaseResponse response = HKService.cardDeletion(new CardDeletionRequest());
- if(){
-
+ BaseResponse response = HKService.cardDeletion(cardDeletionRequest);
+ if(response==null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),response.getMsg());
}
}
@@ -140,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
@@ -197,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);
@@ -209,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