From d7c3b9d46cc331cfc57446d77c44e4c138addd72 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 18:09:04 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 be3fd0a..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("提交失败,请检查你是否有相同的咨询内容在处理中");
}
@@ -174,10 +174,10 @@
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setState("12");
- entity.setDepartmentalId(sysUser.getDepartmentId());
- entity.setToUserId(sysUser.getUserId()+"");
- entity.setFromUserId(order.getGuideUserId());
- entity.setFromDepartmentalId(order.getGuideDepartmentId());
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
@@ -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