From b6af77669bb4d4fa8c96cfb70dcaf97a607dbfe5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 08 三月 2024 13:48:53 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/MemberCardServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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..8bac41e 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,12 +66,18 @@
     @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);
+        memberCard.setIsdeleted(Constants.ZERO);
+        memberCard.setHkStatus(Constants.ZERO);
         memberCardMapper.insert(memberCard);
         dealMemberRoleEmpower(memberMapper.selectById(memberCard.getMemberId()));
         Member member = memberMapper.selectById(memberCard.getMemberId());
@@ -296,10 +302,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