From 783e768b0d8b2956cf5dd10e44a7347772338232 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:30 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 7314f5c..3e47c92 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
@@ -66,7 +66,7 @@
             return ResultData.success();
           }
           else
-            return  ResultData.error();
+              return  ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
     }
 
 
@@ -236,7 +236,7 @@
                 wxUtil.sendGuideRepairOrderComplete(submitUser.getOpenid(),accessToken,guideRepairOrderCompleteTemplateId,order);
             }
             else if (order.getSubmitType().equals(2)){
-                smsUtil.sendSmsComplete(order.getSubmitUserPhone(),order.getMatterName());
+                smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
             }
             order.setState("4");
             entity.setState("9");

--
Gitblit v1.7.1