From fc17ca4f6b87d5a08f67544bac3e5175fbb53085 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:20 +0800
Subject: [PATCH] 1.提交订单给导办人员消息推送 2.提交设置超时时间 3.修改bug
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index 3e47c92..e87bcf7 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -134,9 +134,9 @@
entity.setFromUserId(order.getGuideUserId());
entity.setFromDepartmentalId(order.getGuideDepartmentId());
entity.setGuideId(order.getId().toString());
-
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
iGuideEvolveService.insertConfig(entity);
-
+ order=iGuideRepairOrderService.setTimeoutTim(order);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -179,8 +179,10 @@
entity.setFromUserId(sysUser.getUserId()+"");
entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setGuideId(order.getId().toString());
+ order=iGuideRepairOrderService.setTimeoutTim(order);
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -219,7 +221,7 @@
}
if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
order.setState("2");
- entity.setState("8");
+ entity.setState("9");
}
else if(StringUtils.equals(entity.getState(),"4")){
//待评价
@@ -233,13 +235,13 @@
throw new RuntimeException(e);
}
SysUser submitUser = iGuideRepairOrderService.getSubmitUser(order);
- wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,order);
+ wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,entity);
}
else if (order.getSubmitType().equals(2)){
smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
}
order.setState("4");
- entity.setState("9");
+ entity.setState("7");
}
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
@@ -248,6 +250,7 @@
entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -316,11 +319,6 @@
if(entity.getId()<=0)
{
return ResultData.error("工单id不能为空");
- }
-
- if(!StringUtils.equals(entity.getState(),"4"))
- {
- return ResultData.error("该工单不能评价！");
}
if(StringUtils.isEmpty(entity.getEvaluateState()))
--
Gitblit v1.7.1