From 4b92c6f30a86ad0f804614b2659c1dda368b8fdd Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 05 十二月 2022 16:57:02 +0800
Subject: [PATCH] 更换短信平台
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index c3bde4d..683e8a6 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -145,7 +145,7 @@
//消息推送
this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
//短信发送
- smsUtil.sendSmsSubmit(sysUser.getPhonenumber(), sysUser.getUserName());
+ smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
guideEvolveMapper.insertConfig(entity);
}
} else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
@@ -260,7 +260,7 @@
this.sendGuideRepairOrderSubmit(sysUser.getOpenid(), guideRepairOrder);
}
//短信发送
- smsUtil.sendSmsSubmit(sysUser.getPhonenumber(), sysUser.getUserName());
+ smsUtil.sendSmsSubmitNew(sysUser.getPhonenumber(), sysUser.getUserName());
sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
return sysUserMapper.updateById(sysUser);
} else if (order.getState().equals("10")) {
@@ -274,7 +274,7 @@
GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
.eq(GuideRepairOrder::getId, order.getGuideId()));
//短信发送
- smsUtil.sendSmsSubmit(sysUserTo.getPhonenumber(), sysUserTo.getUserName());
+ smsUtil.sendSmsSubmitNew(sysUserTo.getPhonenumber(), sysUserTo.getUserName());
if (guideRepairOrder != null) {
this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(), guideRepairOrder);
}
@@ -378,8 +378,7 @@
//删除进展记录
guideEvolveMapper.delete(new QueryWrapper<GuideEvolveEntity>().lambda().eq(GuideEvolveEntity::getGuideId, Id));
TransactionEvent transactionEvent = transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrderDelete.getMatterId()));
- if (transactionEvent.getTransactionNum()>0)
- {
+ if (transactionEvent.getTransactionNum() > 0) {
transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() - 1);
}
//对应办事指南减一
@@ -404,14 +403,19 @@
throw new RuntimeException(e);
}
for (GuideRepairOrder guideRepairOrder : guideRepairOrders) {
- transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
- SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
- if (sysUser != null) {
- smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
- wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
- guideRepairOrder.setIsPush(1);
- guideRepairOrder.setIsTimeout("2");
- baseMapper.updateById(guideRepairOrder);
+ List<SysUser> sysUsers = sysUserMapper.selectList(new QueryWrapper<SysUser>().lambda().eq(SysUser::getDepartmentId, guideRepairOrder.getGuideUserPhone()).eq(SysUser::getIsDivisionHead, 1));
+ if (sysUsers != null && sysUsers.size() > 0) {
+ for (SysUser sysUser : sysUsers) {
+// transactionEventMapper.selectOne(new QueryWrapper<TransactionEvent>().lambda().eq(TransactionEvent::getId, guideRepairOrder.getMatterId()));
+// SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
+ if (sysUser != null) {
+ smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
+ wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(), accessToken, "86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8", sysUser);
+ guideRepairOrder.setIsPush(1);
+ guideRepairOrder.setIsTimeout("2");
+ baseMapper.updateById(guideRepairOrder);
+ }
+ }
}
}
return ResultData.success();
@@ -444,7 +448,7 @@
public ResultData deleteComment(Integer id, SysUser sysUser) {
if (sysUser.getUserType().equals("1") || sysUser.getIsDivisionHead().equals("1")) {
GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda().eq(GuideRepairOrder::getId, id));
- if (guideRepairOrder!=null&&guideRepairOrder.getState().equals("3")) {
+ if (guideRepairOrder != null && guideRepairOrder.getState().equals("3")) {
guideRepairOrder.setIsHideComments(1);
baseMapper.updateById(guideRepairOrder);
//新增删除评论进展
@@ -458,15 +462,13 @@
baseMapper.updateById(guideRepairOrder);
return ResultData.success("删除评论成功");
} else {
- return ResultData.error("已办结的单据才能进行删除评论操作");
+ return ResultData.error("已办结的单据才能进行删除评论操作");
}
} else {
return ResultData.error("只能部门领导和超级管理员才能删除评论");
}
}
-
-
}
--
Gitblit v1.7.1