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/api/GuideRepairOrderAppletsController.java |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index e00f2cc..130adcc 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -174,7 +174,7 @@
         }
         if(StringUtils.equals(entity.getState(),"2")){//如果用户选择未解决则状态改为待办
             order.setState("2");
-            entity.setState("8");
+            entity.setState("9");
         }
         else if(StringUtils.equals(entity.getState(),"4")){
             if (order.getSubmitType().equals(1))//小程序提交
@@ -187,14 +187,14 @@
                 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());
@@ -203,6 +203,7 @@
         entity.setToUserId(order.getGuideUserId());
         entity.setGuideId(order.getId().toString());
         iGuideEvolveService.insertConfig(entity);
+        iGuideRepairOrderService.updateSysUserOrderNum(entity);
         return toAjax(iGuideRepairOrderService.updateConfig(order));
     }
 
@@ -271,12 +272,6 @@
         {
             return ResultData.error("工单id不能为空");
         }
-
-        if(!StringUtils.equals(entity.getState(),"4"))
-        {
-            return ResultData.error("该工单不能评价!");
-        }
-
         if(StringUtils.isEmpty(entity.getEvaluateState()))
         {
             return ResultData.error("满意程度不能为空!");

--
Gitblit v1.7.1