From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformBooksServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 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 ad482b6..9c6977e 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,7 +1,5 @@
package com.doumee.service.business.impl;
-import cn.emay.sdk.util.StringUtil;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -10,13 +8,21 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
+import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.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.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.join.NoticesJoinMapper;
-import com.doumee.dao.web.reqeust.ConfirmTaskDTO;
+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;
import com.doumee.dao.web.reqeust.RevokeDTO;
@@ -26,8 +32,8 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.third.EmayService;
import org.apache.commons.lang3.StringUtils;
-import org.apache.tomcat.util.bcel.Const;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,6 +41,7 @@
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -66,6 +73,9 @@
private SystemDictDataBiz systemDictDataBiz;
@Autowired
+ private SystemUserMapper systemUserMapper;
+
+ @Autowired
private ApproveService approveService;
@Autowired
@@ -77,6 +87,17 @@
@Autowired
private CarsMapper carsMapper;
+ @Autowired
+ private SmsConfigMapper smsConfigMapper;
+
+ @Autowired
+ private SmsEmailMapper smsEmailMapper;
+
+ @Autowired
+ private EmayService emayService;
+
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
@Override
public Integer create(PlatformBooks platformBooks) {
@@ -251,11 +272,14 @@
if(!Constants.equalsInteger(platformGroup.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"缁戝畾鏈堝彴缁勬暟鎹紓甯革紝璇疯仈绯荤鐞嗗憳");
}
+ if(!Constants.checkCarNo(platformBooksApplyDTO.getCarCodeFront())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ纭殑杞︾墝!");
+ };
//鏌ヨ杞﹁締鏄惁涓鸿嚜鏈夎溅
if(carsMapper.selectCount(new QueryWrapper<Cars>().lambda().eq(Cars::getIsdeleted,Constants.ZERO).eq(Cars::getCode,platformBooksApplyDTO.getCarCodeFront()))>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"["+platformBooksApplyDTO.getCarCodeFront()+"]灞炰簬鍐呴儴杞﹁締锛屾棤娉曢绾�");
};
- ApproveTempl approveTempl = approveTemplMapper.selectById(platformReason.getId());
+ ApproveTempl approveTempl = approveTemplMapper.selectById(platformReason.getApproveTemplId());
if(Objects.isNull(approveTempl)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈厤缃鎵规祦,璇疯仈绯荤鐞嗗憳");
}
@@ -272,7 +296,22 @@
platformBooksMapper.insert(platformBooks);
//鍒涘缓瀹℃壒娴佷俊鎭�
- approveService.createApproveForPlatfrom(platformReason.getApproveTemplId(),platformBooks.getId(),platformBooks.getDriverId());
+ approveService.createApproveForPlatfrom(approveTempl.getId(),platformBooks.getId(),platformBooks.getDriverId());
+ //鍙戦�佸叕浼楀彿閫氱煡 缁欐彁浜や汉
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,platformBooks.getDriverPhone())
+ .last(" limit 1 "));
+
+ if(Objects.nonNull(driver)&&StringUtils.isNotBlank(driver.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,platformBooks,
+ WxPlatConstants.platformBookContent.platformBookUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(driver.getOpenid().split(",")),0);
+ }
return platformBooks.getId();
}
@@ -354,6 +393,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;
}
@@ -389,6 +442,15 @@
.eq(Approve::getObjType,Constants.approveObjectType.logisticsCarUse)
.eq(Approve::getObjId,revokeDTO.getId())
);
+
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,model.getId(),
+ SmsConstants.platformBookContent.platformBookCancel,
+ null,null
+ );
+
+
}
--
Gitblit v1.9.3