From 48a62ed1badc7b68a81e253240672b15d4c3d74a Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 18:31:01 +0800
Subject: [PATCH] 修改获取节假日依赖及代码
---
flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 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 870c228..69b31a4 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
@@ -12,6 +12,7 @@
import com.dg.core.util.Snowflake;
import com.dg.core.util.TestDate;
import com.dg.core.util.WxUtil;
+import com.iceyyy.workday.WorkUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -101,6 +102,7 @@
sysUserMapper.updateById(sysUser);
guideRepairOrder.setGuideUserId(sysUser.getUserId().toString());
guideRepairOrder.setGuideDepartmentId(sysUser.getDepartmentId());
+ guideRepairOrder.setGuideUserPhone(sysUser.getPhonenumber());
//新增分配记录
GuideEvolveEntity entity = new GuideEvolveEntity();
entity.setCreateTime(LocalDateTime.now());
@@ -115,15 +117,7 @@
guideRepairOrder=this.setTimeoutTim(guideRepairOrder);
//超时时间设置业务结束
//消息推送
- WxUtil wxUtil=new WxUtil();
- String accessToken="0";
- try {
- accessToken= wxUtil.getBatteryCarAccessToken();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- wxUtil.sendGuideRepairOrderSubmit(sysUser.getOpenid(),accessToken,"WggWK_yG7_qfrTj8bQe-2co4ATgpXamLzT1xvrTu4K0",guideRepairOrder);
-// smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
+ this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
guideEvolveMapper.insertConfig(entity);
}
} else {//如果该办事指南用户所选所属地区无导半部门则为特殊单据需要手动分配
@@ -133,6 +127,7 @@
guideRepairOrder.setCreateTime(LocalDateTime.now());
guideRepairOrder.setUpdateTime(LocalDateTime.now());
+ guideRepairOrder.setIsPush(2);
transactionEvent.setTransactionNum(transactionEvent.getTransactionNum() + 1);
//保存图片地址
if (guideRepairOrder.getImages() != null) {
@@ -219,16 +214,26 @@
@Override
public int updateSysUserOrderNum(GuideEvolveEntity order) {
- if (order.getState().equals("13")) {
+ if (order.getState().equals("11")) {
SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
+ GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
+ .eq(GuideRepairOrder::getId, order.getGuideId()));
+ if (guideRepairOrder!=null){
+ this.sendGuideRepairOrderSubmit(sysUser.getOpenid(),guideRepairOrder);
+ }
sysUser.setTransactionNum(sysUser.getTransactionNum() + 1);
return sysUserMapper.updateById(sysUser);
- } else if (order.getState().equals("12")) {
+ } else if (order.getState().equals("10")) {
SysUser sysUserTo = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getToUserId()));
SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
sysUserTo.setTransactionNum(sysUserTo.getTransactionNum() + 1);
sysUserFrom.setTransactionNum(sysUserFrom.getTransactionNum() - 1);
sysUserMapper.updateById(sysUserFrom);
+ GuideRepairOrder guideRepairOrder = baseMapper.selectOne(new QueryWrapper<GuideRepairOrder>().lambda()
+ .eq(GuideRepairOrder::getId, order.getGuideId()));
+ if (guideRepairOrder!=null){
+ this.sendGuideRepairOrderSubmit(sysUserTo.getOpenid(),guideRepairOrder);
+ }
return sysUserMapper.updateById(sysUserTo);
} else if (order.getState().equals("7")) {
SysUser sysUserFrom = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, order.getFromUserId()));
@@ -274,7 +279,9 @@
LocalDateTime endTime = LocalDate.now().atTime(23, 59, 59);//今天结束时间
TestDate td = new TestDate();
DateTime dateTimeUser= DateTime.now();
- if (td.isWeekday(dateTimeUser)){
+ String format="YYYYMMdd";
+ String dateTimeToday=dateTimeUser.toString(format);
+ if (!WorkUtils.isWorkendDay(dateTimeToday)){
if ( LocalDateTime.now().isAfter(startTime)&&LocalDateTime.now().isBefore(morningStartTime)){//提交时间是上午上班前
guideRepairOrder.setTimeoutTime(LocalDate.now().
atTime(9+automessageSysSettings.getTimeoutNotificationNum(),0,0));
@@ -305,5 +312,23 @@
return guideRepairOrder;
}
+ @Override
+ public void sendGuideRepairOrderSubmit (String openid,GuideRepairOrder guideRepairOrder){
+ WxUtil wxUtil=new WxUtil();
+ String accessToken="0";
+ try {
+ accessToken= wxUtil.getBatteryCarAccessToken();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ wxUtil.sendGuideRepairOrderSubmit(openid,accessToken,"WggWK_yG7_qfrTj8bQe-2co4ATgpXamLzT1xvrTu4K0",guideRepairOrder);
+// smsUtil.sendSmsOvertime(sysUser.getPhonenumber(),guideRepairOrder.getMatterName());
+ }
+
+ @Override
+ public int deleteConfigById(String Id) {
+ return baseMapper.deleteConfigById(Id);
+ }
+
}
--
Gitblit v1.7.1