From 0f28c38f1a978a47b8221dff56eeebf26a9e6fac Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 20 十月 2022 14:39:36 +0800
Subject: [PATCH] 修改bug
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 62 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 22 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 53668c1..3ae5998 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
@@ -10,6 +10,8 @@
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IGuideEvolveService;
import com.dg.core.service.IGuideRepairOrderService;
+import com.dg.core.util.SmsUtil;
+import com.dg.core.util.WxUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
@@ -18,6 +20,8 @@
import javax.annotation.Resource;
import java.time.LocalDateTime;
+
+
/**
* 工单管理
@@ -33,6 +37,11 @@
@Autowired
private IGuideEvolveService iGuideEvolveService;
+ private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
+
+ @Resource
+ SmsUtil smsUtil;
+
/**
* 提交导办订单
* @return
@@ -43,13 +52,14 @@
public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
+ guideRepairOrder.setSubmitType(1);
int i = iGuideRepairOrderService.addOrder(guideRepairOrder);
if (i>0){
iGuideEvolveService.updateGuid();
return ResultData.success();
}
else
- return ResultData.error();
+ return ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
}
@@ -113,13 +123,13 @@
GuideEvolveEntity entity=new GuideEvolveEntity();
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.setState("10");
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
+ entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -158,12 +168,27 @@
}
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))//小程序提交
+ {
+ WxUtil wxUtil=new WxUtil();
+ String accessToken="0";
+ try {
+ accessToken= wxUtil.getBatteryCarAccessToken();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ SysUser submitUser = iGuideRepairOrderService.getSubmitUser(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());
@@ -172,6 +197,7 @@
entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -213,8 +239,8 @@
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setState("5");
- entity.setFromDepartmentalId(sysUser.getDepartmentId());
- entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setDepartmentalId(sysUser.getDepartmentId());
+ entity.setToUserId(sysUser.getUserId()+"");
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -240,12 +266,6 @@
{
return ResultData.error("工单id不能为空");
}
-
- if(!StringUtils.equals(entity.getState(),"4"))
- {
- return ResultData.error("该工单不能评价！");
- }
-
if(StringUtils.isEmpty(entity.getEvaluateState()))
{
return ResultData.error("满意程度不能为空！");
@@ -257,9 +277,9 @@
GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
- guideEvolveEntity.setState("3");
- guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
- guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setState("13");
+ guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
int i = iGuideRepairOrderService.updateConfig(entity);
if (i>0)
return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
@@ -278,7 +298,5 @@
public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
}
-
-
}
--
Gitblit v1.7.1