From 05372fd5f0eb8a0f5ed65e7691fe569dd3fbd9f0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期六, 15 十月 2022 18:06:23 +0800
Subject: [PATCH] 1.修改bug 2.后台首页小程序统计
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 119 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 44 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 40f7f6e..e00f2cc 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
@@ -1,6 +1,7 @@
package com.dg.core.api;
+import com.alibaba.fastjson.JSON;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
@@ -8,8 +9,11 @@
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import com.dg.core.db.gen.entity.GuideRepairOrder;
import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.manual.mapper.util.ConstantPropertiesUtil;
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;
@@ -17,7 +21,12 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.IOException;
import java.time.LocalDateTime;
+import java.util.Map;
+
+import static com.dg.core.util.WxUtil.httpGet;
+
/**
* 工单管理
@@ -33,6 +42,11 @@
@Autowired
private IGuideEvolveService iGuideEvolveService;
+ private static String guideRepairOrderCompleteTemplateId = "7ZCHHii87rWPwVkdhZnvNiYbYi_Buq0NXO10cmUhAFk";
+
+ @Resource
+ SmsUtil smsUtil;
+
/**
* 提交导办订单
* @return
@@ -43,7 +57,14 @@
public ResultData addOrder(@RequestBody GuideRepairOrder guideRepairOrder,@CurrentUser SysUser sysUser) {
guideRepairOrder.setSubmitUserId(sysUser.getUserId().toString());
guideRepairOrder.setSubmitUserPhone(sysUser.getPhonenumber());
- return toAjax(iGuideRepairOrderService.addOrder(guideRepairOrder));
+ guideRepairOrder.setSubmitType(1);
+ int i = iGuideRepairOrderService.addOrder(guideRepairOrder);
+ if (i>0){
+ iGuideEvolveService.updateGuid();
+ return ResultData.success();
+ }
+ else
+ return ResultData.error("提交失败,请检查你是否有相同的咨询内容在处理中");
}
@@ -108,12 +129,13 @@
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());
iGuideEvolveService.insertConfig(entity);
+ iGuideRepairOrderService.updateSysUserOrderNum(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
}
@@ -155,6 +177,21 @@
entity.setState("8");
}
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,order);
+ }
+ else if (order.getSubmitType().equals(2)){
+ smsUtil.sendSmsComplete(order.getConsultUserPhone(),order.getMatterName());
+ }
//待评价
order.setState("4");
entity.setState("9");
@@ -162,8 +199,8 @@
//新增已办结记录
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
- entity.setFromDepartmentalId(sysUser.getDepartmentId());
- entity.setFromUserId(sysUser.getUserId()+"");
+ entity.setDepartmentalId(order.getGuideDepartmentId());
+ entity.setToUserId(order.getGuideUserId());
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
@@ -207,8 +244,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));
}
@@ -225,48 +262,40 @@
@Authorization
public ResultData evaluate(@RequestBody GuideRepairOrder entity, @CurrentUser SysUser sysUser)
{
-// if(entity==null)
-// {
-// return ResultData.error("参数不能为空");
-// }
-//
-// if(entity.getId()<=0)
-// {
-// return ResultData.error("工单id不能为空");
-// }
-//
-// if(!StringUtils.equals(entity.getState(),"4"))
-// {
-// return ResultData.error("该工单不能评价！");
-// }
-//
-// if(StringUtils.isEmpty(entity.getEvaluateState()))
-// {
-// return ResultData.error("满意程度不能为空！");
-// }
-
-
- if(sysUser==null)
+ if(entity==null)
{
- return ResultData.error("sysUser为空！");
+ return ResultData.error("参数不能为空");
}
+ if(entity.getId()<=0)
+ {
+ return ResultData.error("工单id不能为空");
+ }
+ if(!StringUtils.equals(entity.getState(),"4"))
+ {
+ return ResultData.error("该工单不能评价！");
+ }
+ if(StringUtils.isEmpty(entity.getEvaluateState()))
+ {
+ return ResultData.error("满意程度不能为空！");
+ }
//已办结
-// entity.setState("3");
-// //新增已办结记录
-// GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
-// guideEvolveEntity.setCreateTime(LocalDateTime.now());
-// guideEvolveEntity.setUpdateTime(LocalDateTime.now());
-// guideEvolveEntity.setState("3");
-// guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
-// guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
-// iGuideEvolveService.insertConfig(guideEvolveEntity);
-
-// return toAjax(iGuideRepairOrderService.updateConfig(entity));
- return ResultData.success(sysUser.getUserId()+"");
+ entity.setState("3");
+ //新增已办结记录
+ GuideEvolveEntity guideEvolveEntity=new GuideEvolveEntity();
+ guideEvolveEntity.setCreateTime(LocalDateTime.now());
+ guideEvolveEntity.setUpdateTime(LocalDateTime.now());
+ guideEvolveEntity.setState("3");
+ guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
+ int i = iGuideRepairOrderService.updateConfig(entity);
+ if (i>0)
+ return toAjax( iGuideEvolveService.insertConfig(guideEvolveEntity));
+ else
+ return ResultData.error();
}
/**
@@ -283,4 +312,6 @@
+
+
}
--
Gitblit v1.7.1