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 |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 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 4a84782..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
@@ -66,22 +66,25 @@
     @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(),"鏈煡璇㈠埌鐢ㄦ埛淇℃伅");
         }
         CardBingdingRequest param = new CardBingdingRequest();
         if(member.getStartTime() !=null && member.getEndTime()!=null){
-            param.setStartDate(DateUtil.getISO8601Timestamp(member.getStartTime()));
-            param.setEndDate(DateUtil.getISO8601Timestamp(member.getEndTime()));
+            param.setStartDate(DateUtil.getShortTime(member.getStartTime()));
+            param.setEndDate(DateUtil.getShortTime(member.getEndTime()));
         }
         CardInfoRequest cr = new CardInfoRequest();
         cr.setCardNo(memberCard.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) {

--
Gitblit v1.9.3