From aed1ef97d6ae1d3961b9a57c767758c9d34e1b93 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 04 三月 2024 14:01:15 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java |   33 +++++++++++++++++++++++++++------
 1 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 3c3e1e5..f04186c 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -387,12 +387,14 @@
         Member member = new Member();
         BeanUtils.copyProperties(param,member);
         member.setCreateDate(date);
-        if(StringUtils.isBlank(param.getFaceImg())){
+        /*if(StringUtils.isBlank(param.getFaceImg())){
             member.setHkStatus(Constants.THREE);
         }else{
             member.setHkStatus(Constants.ZERO);
             member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
-        }
+        }*/
+        member.setHkStatus(Constants.ZERO);
+        member.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
         member.setErpStatus(Constants.ONE);
         member.setErpDate(date);
         member.setErpId(param.getId());
@@ -406,6 +408,7 @@
         member.setRoleIds(param.getRoleIds());
         member.setCompanyId(Objects.isNull(company)?null:company.getId());
         member.setErpOrgId(param.getOrgId());
+        member.setCanVisit(Constants.ONE);
 //        member.setStartTime(request.getStartTime());
 //        member.setEndTime(request.getEndTime());
         return  member;
@@ -521,6 +524,11 @@
                    for (DeviceRole deviceRole:deviceRoleList) {
                        RoleListResponse roleListResponse = new RoleListResponse();
                        BeanUtils.copyProperties(deviceRole,roleListResponse);
+                       if(deviceRole.getType().equals(Constants.TWO)){
+                           roleListResponse.setType(Constants.ONE);
+                       }else{
+                           roleListResponse.setType(Constants.ZERO);
+                       }
                        if(StringUtils.isNotBlank(deviceRole.getDoorIds())){
                            List<DeviceListResponse> DeviceListResponseList = new ArrayList<>();
                            List<String>  doorList = Arrays.asList(deviceRole.getDoorIds().split(","));
@@ -1009,12 +1017,16 @@
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
         }
         List<Integer> doorIds = getRoleIdByParam(param.getRoleIds(),member);
+        if(StringUtils.isBlank(member.getRoleId())){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌闂ㄧ缁勬暟鎹�");
+        }
         //鏇存柊鎺堟潈鏈夋晥鏈�
         Member update = new Member();
         update.setId(member.getId());
         update.setEditDate(new Date());
         update.setStartTime(param.getValidStartTime());
         update.setEndTime(param.getValidEndTime());
+        update.setRoleId(StringUtils.isNotBlank(member.getRoleId())?member.getRoleId():null);
         update.setHkStatus(Constants.ZERO);//鍋氫竴閬嶆洿鏂伴�昏緫
         update.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
         memberMapper.updateById(update);
@@ -1027,8 +1039,10 @@
                 ||StringUtils.isBlank(param.getCarCode())){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
-        if(param.getValidStartTime()!=null && param.getValidEndTime()!=null&&param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
-            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+        if(Objects.nonNull(param.getValidStartTime())&&Objects.nonNull(param.getValidEndTime())){
+            if(param.getValidStartTime().getTime()> param.getValidEndTime().getTime()){
+                throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+            }
         }
         Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
         if(Objects.isNull(member)){
@@ -1041,7 +1055,14 @@
                 .set(ParkBook::getHkStatus,Constants.ZERO)
         );
         //鏌ヨ杞﹀簱淇℃伅
-        List<Parks> parksList = parksMapper.selectList(new QueryWrapper<Parks>().lambda().in(Parks::getId,param.getParkIdList()));
+        List<Parks> parksList = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(param.getParkIdList())){
+             parksList  = parksMapper.selectList(new QueryWrapper<Parks>().lambda()
+                    .in(Parks::getId,param.getParkIdList())
+            );
+        }else{
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�");
+        }
         if(CollectionUtils.isNotEmpty(parksList)){
             List<ParkBook> parkBookList = new ArrayList<>();
             for (Parks parks:parksList) {
@@ -1052,7 +1073,7 @@
                 parkBook.setParkId(parks.getId());
                 parkBook.setOrigin(Constants.ZERO);
                 parkBook.setStartTime(Objects.isNull(param.getValidStartTime())?new Date():param.getValidStartTime());
-                parkBook.setEndTime(param.getValidEndTime());
+                parkBook.setEndTime(Objects.isNull(param.getValidEndTime())?null:param.getValidEndTime());
                 parkBook.setTimeType(Objects.isNull(param.getValidEndTime())?Constants.ZERO:Constants.ONE);
                 parkBook.setMemberId(member.getId());
                 parkBook.setHkStatus(Constants.ZERO);

--
Gitblit v1.9.3