From 10c28ce3d0b384584c77ce9111a66a0641250752 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 27 二月 2025 18:30:32 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java |   55 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 6 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 9c6977e..f32e69e 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
@@ -1,11 +1,13 @@
 package com.doumee.service.business.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dao.UserActionMapper;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.DateUtil;
 import com.doumee.core.utils.SmsConstants;
@@ -13,12 +15,14 @@
 import com.doumee.core.wx.wxPlat.WxPlatConstants;
 import com.doumee.core.wx.wxPlat.WxPlatNotice;
 import com.doumee.dao.business.*;
+import com.doumee.dao.business.dao.MemberMapper;
 import com.doumee.dao.business.dao.SmsConfigMapper;
 import com.doumee.dao.business.dao.SmsEmailMapper;
 import com.doumee.dao.business.join.ApproveJoinMapper;
 import com.doumee.dao.business.model.*;
 import com.doumee.dao.business.vo.ApproveDataVO;
 
+import com.doumee.dao.business.model.Member;
 import com.doumee.dao.system.SystemUserMapper;
 import com.doumee.dao.system.join.NoticesJoinMapper;
 import com.doumee.dao.system.model.Notices;
@@ -56,6 +60,10 @@
 
     @Autowired
     private PlatformBooksMapper platformBooksMapper;
+    @Autowired
+    private UserActionMapper userActionMapper;
+    @Autowired
+    private PlatformJobMapper platformJobMapper;
 
     @Autowired
     private NoticesJoinMapper noticesJoinMapper;
@@ -111,7 +119,32 @@
     public void deleteById(Integer id) {
         platformBooksMapper.deleteById(id);
     }
-
+    @Override
+    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
+    public void deleteById(Integer id,LoginUserInfo user) {
+        PlatformBooks model =findById(id);
+        if(model ==null || Constants.equalsInteger(model.getIsdeleted(),Constants.ONE)){
+            throw  new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+        Date date =new Date();
+        platformBooksMapper.update(null,new UpdateWrapper<PlatformBooks>().lambda()
+                .set(PlatformBooks::getIsdeleted,Constants.ONE)
+                .set(PlatformBooks::getEditDate,date)
+                .set(PlatformBooks::getEditor,user.getId())
+                .eq(PlatformBooks::getId,id));
+        platformJobMapper.update(null,new UpdateWrapper<PlatformJob>().lambda()
+                .set(PlatformJob::getIsdeleted,Constants.ONE)
+                .set(PlatformJob::getEditDate,new Date())
+                .set(PlatformJob::getEditor,user.getId())
+                .eq(PlatformJob::getBookId,id)
+                .eq(PlatformJob::getIsdeleted,Constants.ZERO));
+        String[] params = new String[3];
+        params[0] = user.getRealname();
+        params[1]=DateUtil.getPlusTime2(date);
+        params[2]=model.getContractNum()+"-銆愬徃鏈猴細"+model.getDriverName()+" "+model.getDriverPhone()+"銆�-銆愯溅鐗屽ソ锛� "+model.getPlateNum()+"銆�";
+        //璁板綍鍒犻櫎鏃ュ織
+        UserActionServiceImpl.saveUserActionBiz(user,id,Constants.UserActionType.PLATFROM_BOOK_DEL,userActionMapper,date,params, JSONObject.toJSONString(model));
+    }
     @Override
     public void delete(PlatformBooks platformBooks) {
         UpdateWrapper<PlatformBooks> deleteWrapper = new UpdateWrapper<>(platformBooks);
@@ -302,12 +335,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);
@@ -416,7 +450,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);
         }
@@ -443,6 +476,16 @@
                 .eq(Approve::getObjId,revokeDTO.getId())
         );
 
+        noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+                .set(Notices::getEditDate,new Date())
+                .set(Notices::getInfo,"鐗╂祦杞﹂绾︾敵璇峰彇娑�")
+                .set(Notices::getReaded,Constants.ONE)
+                .set(Notices::getParam2,Constants.TWO)
+                .set(Notices::getStatus,Constants.ONE)
+                .eq(Notices::getType,Constants.noticesObjectType.reason)
+                .eq(Notices::getObjId,model.getId())
+        );
+
         //鍙戦�佺煭淇¢�氱煡
         SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
                 emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,model.getId(),

--
Gitblit v1.9.3