From b7210488b6129ceb614e559d0240bf3ed3321dea Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 05 十二月 2024 19:36:20 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
index 1ba80f2..b881fa4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CarUseBookServiceImpl.java
@@ -7,14 +7,20 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
+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.SmsConfigMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.join.CarUseBookJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
import com.doumee.dao.business.vo.DateIntervalVO;
+
+import com.doumee.dao.system.join.NoticesJoinMapper;
+import com.doumee.dao.system.model.Notices;
import com.doumee.dao.system.model.SystemDictData;
-import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.ApproveService;
import com.doumee.service.business.CarUseBookService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -23,7 +29,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -33,10 +38,8 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.Date;
-import java.util.stream.Collectors;
/**
* 杞﹁締_鐢ㄨ溅鐢宠淇℃伅琛⊿ervice瀹炵幇
@@ -62,6 +65,9 @@
private ApproveJoinMapper approveJoinMapper;
@Autowired
+ private NoticesJoinMapper noticesJoinMapper;
+
+ @Autowired
private ApproveService approveService;
@Autowired
@@ -79,6 +85,9 @@
@Autowired
private EmayService emayService;
+
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -101,7 +110,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐧诲綍鐢ㄦ埛鏃犳硶杩涜璇ユ搷浣�!");
}
if(carUseBook.getEndTime().getTime()<=System.currentTimeMillis()){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"閫夋嫨鏃ユ湡寮傚父[缁撴潫鏃堕棿灏忎簬褰撳墠鏃堕棿],璇峰埛鏂伴噸璇�");
}
if(!(DateUtil.getDateFromString(carUseBook.getPlanUseDate()+":00").getTime()>=carUseBook.getStartTime().getTime()
&& DateUtil.getDateFromString(carUseBook.getPlanUseDate() +":00").getTime()<= carUseBook.getEndTime().getTime())
@@ -120,7 +129,7 @@
CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
.eq(CarDriver::getCarId,cars.getId())
.eq(CarDriver::getIsdeleted,Constants.ZERO)
- .eq(CarDriver::getStatus,Constants.ONE)
+// .eq(CarDriver::getStatus,Constants.ZERO)
.last( " limit 1 ")
);
if(Objects.nonNull(carDriver)&&Objects.nonNull(carDriver.getMemberId())){
@@ -133,6 +142,18 @@
carUseBookMapper.insert(carUseBook);
//鐢ㄨ溅鐢宠 瀹℃壒璁板綍鍒涘缓
approveService.createApproveFlow(carUseBook.getType()==0?3:4,carUseBook.getId(),carUseBook.getMemberId());
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ Member member = memberMapper.selectById(carUseBook.getMemberId());
+ if(Objects.nonNull(member) && StringUtils.isNotBlank(member.getOpenid())){
+ wxPlatNotice.sendCarUseBookTemplateNotice(
+ wxNoticeConfigMapper,carUseBook,
+ WxPlatConstants.carUseBookContent.carUseBookUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(member.getOpenid().split(",")),0);
+ }
+
return carUseBook.getId();
}
@@ -414,7 +435,7 @@
}
//鍒ゆ柇鏃堕棿鏄惁澶т簬褰撳墠
if(Constants.equalsInteger(dateIntervalVO.getIsUse(),Constants.ZERO) && DateUtil.getDateFromString(dateIntervalVO.getEndTime()).getTime()<=System.currentTimeMillis()){
- dateIntervalVO.setIsUse(Constants.ONE);
+// dateIntervalVO.setIsUse(Constants.ONE);
continue;
}
}
@@ -475,6 +496,15 @@
.in(Approve::getObjType,Constants.approveObjectType.cityUseCar,Constants.approveObjectType.unCityUseCar)
.eq(Approve::getObjId,id)
);
+
+ //澶勭悊寰呭姙淇℃伅
+ noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
+ .set(Notices::getStatus,Constants.ONE)
+ .eq(Notices::getType,Constants.TWO)
+ .eq(Notices::getObjId,carUseBook.getId())
+ );
+
+
Member member = memberMapper.selectById(carUseBook.getMemberId());
if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){
//鐢ㄨ溅鐢宠鍙栨秷
--
Gitblit v1.9.3