From cd9cbc46c0774c01674be435bcc86d4a03ada687 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 27 二月 2024 14:18:13 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java |   29 +++++++++++++++++++++++------
 1 files changed, 23 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 9d4127d..bbbb7b3 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
@@ -6,6 +6,7 @@
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.DataSyncConfig;
 import com.doumee.config.Jwt.JwtPayLoad;
 import com.doumee.config.Jwt.JwtTokenUtil;
 import com.doumee.core.constants.ResponseStatus;
@@ -26,12 +27,13 @@
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.Utils;
 import com.doumee.core.utils.redis.RedisUtil;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
 import com.doumee.dao.business.*;
 import com.doumee.dao.business.join.CarEventJoinMapper;
 import com.doumee.dao.business.join.DeviceEventJoinMapper;
 import com.doumee.dao.business.join.VisitEventJoinMapper;
 import com.doumee.dao.business.model.*;
-import com.doumee.service.business.ERPSyncService;
+import com.doumee.service.business.ext.ERPSyncService;
 import com.doumee.service.business.InterfaceLogService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import lombok.Synchronized;
@@ -58,6 +60,8 @@
     @Autowired
     private SystemDictDataBiz systemDictDataBiz;
 
+    @Autowired
+    private DataSyncConfig dataSyncConfig;
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
@@ -109,6 +113,9 @@
     private ErpTool erpTool;
 
 
+    @Autowired
+    private WxPlatNotice wxPlatNotice;
+
     @Override
     @PostConstruct
     public  int  initHkConfig(){
@@ -127,7 +134,7 @@
     @Transactional
     @Synchronized
     public String syncCompany(OrgListRequest param){
-        if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
+        if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
         }
         //鑾峰彇ERP缁勭粐淇℃伅锛堝叏閲忓悓姝ワ級
@@ -278,8 +285,8 @@
     @Transactional
     @Synchronized
     public  String syncUsers(UserListRequest param){
-        if(!StringUtils.equals(Constants.ONE+"", systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ORG_USER_ORIGIN).getCode())){
-            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佷汉鍛樺悓姝ユ搷浣渵");
+        if( Constants.formatIntegerNum(dataSyncConfig.getOrgUserDataOrigin()) != DataSyncConfig.origin.erp){
+            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀵逛笉璧凤紝褰撳墠涓嶆敮鎸佺粍缁囧悓姝ユ搷浣渵");
         }
         List<ErpUserListResponse>  list = erpTool.getErpUserList(ErpConstants.userListUrl,param);
         if(list !=null && list.size()>0) {
@@ -1000,9 +1007,12 @@
                 ||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(),"瀵逛笉璧凤紝鏈夋晥鏈熸椂闂翠笉鍚堟硶锛�");
+        }
         Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getErpId,param.getUserId()).last("limit 1"));
         if(Objects.isNull(member)){
-            return;
+            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鐢ㄦ埛淇℃伅涓嶅瓨鍦紒");
         }
         //鍒犻櫎杞﹂噺搴撹褰曟暟鎹�
         parkBookMapper.update(null,new UpdateWrapper<ParkBook>().lambda()
@@ -1030,6 +1040,8 @@
                 parkBookList.add(parkBook);
             }
             parkBookMapper.insertBatchSomeColumn(parkBookList);
+        }else{
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鍋滆溅搴撲俊鎭笉瀛樺湪锛屾巿鏉冨け璐�");
         }
 
     }
@@ -1053,11 +1065,16 @@
             List<Visits> visitsList = visitsMapper.selectList(new QueryWrapper<Visits>().lambda().eq(Visits::getErpId,param.getId()));
             if(CollectionUtils.isNotEmpty(visitsList)){
                 visitsList.forEach(i->{
-                    i.setStatus(param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
+                    i.setStatus(!param.getStatus().equals(Constants.ZERO)?Constants.VisitStatus.pass:Constants.VisitStatus.noPass);
                     i.setEndCheckDate(DateUtil.StringToDate(param.getApproveDate(),"yyyy-MM-dd HH:mm:ss"));
                     i.setHkStatus(Constants.ZERO);
                     i.setRemark("寰呭悓姝ュ畨闃插钩鍙�");
                     visitsMapper.updateById(i);
+                    if(Objects.isNull(i.getParentId())){
+                        wxPlatNotice.sendVisitAuditTemplateNotice(i,
+                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
+                                systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
+                    }
                 });
             }
         }catch (BusinessException e){

--
Gitblit v1.9.3