From d70d789667434c1ba80b281f398137d66d68aa6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 23 十二月 2024 17:33:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
index 8a53ba9..42e1c16 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java
@@ -21,6 +21,7 @@
 
 import com.doumee.dao.system.SystemUserMapper;
 import com.doumee.dao.system.join.NoticesJoinMapper;
+import com.doumee.dao.system.model.Notices;
 import com.doumee.dao.system.model.SystemUser;
 import com.doumee.dao.web.reqeust.PlatformBooksApplyDTO;
 import com.doumee.dao.web.reqeust.PlatformBooksCheckNumDTO;
@@ -301,12 +302,13 @@
                 .eq(SystemUser::getDeleted, Constants.ZERO)
                 .eq(SystemUser::getType, Constants.ZERO)
                 .eq(SystemUser::getMobile,platformBooks.getDriverPhone())
+                .isNotNull(SystemUser::getOpenid)
                 .last(" limit 1 "));
 
         if(Objects.nonNull(driver)&&StringUtils.isNotBlank(driver.getOpenid())){
             WxPlatNotice wxPlatNotice = new WxPlatNotice();
             wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
-                    wxNoticeConfigMapper,platformBooks,
+                    wxNoticeConfigMapper, platformBooks,
                     WxPlatConstants.platformBookContent.platformBookUpload,
                     systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
                     Arrays.asList(driver.getOpenid().split(",")),0);
@@ -392,6 +394,20 @@
             approve.setCheckDate(model.getCancelTime());
             approveList.add(approve);
         }
+
+        Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+                .eq(Notices::getObjId,id)
+                .eq(Notices::getType,Constants.noticesObjectType.reason)
+                .eq(Notices::getUserId,memberId)
+                .eq(Notices::getSendacopy,Constants.ZERO)
+                .orderByDesc(Notices::getId).last(" limit 1 "));
+        if(Objects.nonNull(notices)){
+            if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+                model.setInfo("寰呮垜澶勭悊");
+            }else{
+                model.setInfo(notices.getInfo());
+            }
+        }
         return model;
     }
 
@@ -401,7 +417,6 @@
     public void revoke(RevokeDTO revokeDTO, LoginUserInfo loginUserInfo){
         if(Objects.isNull(revokeDTO)
                 || Objects.isNull(revokeDTO.getId())
-                || StringUtils.isBlank(revokeDTO.getInfo())
         ){
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }

--
Gitblit v1.9.3