From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java |   72 ++++++++++++++++++++++++++++++++----
 1 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
index d9da9ee..402927e 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dg.core.ResultData;
 import com.dg.core.db.gen.entity.*;
 import com.dg.core.db.gen.mapper.*;
 import com.dg.core.service.IGuideRepairOrderService;
@@ -110,8 +111,8 @@
                     entity.setState("8");
                     entity.setDepartmentalId(sysUser.getDepartmentId());
                     entity.setToUserId(guideRepairOrder.getGuideUserId() + "");
-                    entity.setFromUserId(guideRepairOrder.getSubmitUserId());
-                    entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
+//                    entity.setFromUserId(guideRepairOrder.getSubmitUserId());
+//                    entity.setFromDepartmentalId(guideRepairOrder.getGuideDepartmentId());
                     entity.setGuidOrderNum(guideRepairOrder.getOrderNum());
                     //超时时间设置业务开始
                     guideRepairOrder = this.setTimeoutTim(guideRepairOrder);
@@ -201,13 +202,20 @@
 
     @Override
     public List<GuideRepairOrder> selectConfigList(IPage<GuideRepairOrder> page, Integer state,
-                                                   String matterName, List<String> ids,String status) {
-        return baseMapper.selectConfigList(page, state, matterName, ids,status);
+                                                   String matterName, List<String> ids,String status,
+                                                   String guideUserId) {
+        return baseMapper.selectConfigList(page, state, matterName, ids,status,guideUserId);
     }
 
     @Override
-    public int countConfigList(String matterName, List<String> ids,String status) {
-        return baseMapper.countConfigList(matterName, ids,status);
+    public List<GuideRepairOrder> selectConfigList(String matterName, List<String> ids,String status,
+                                                   String guideUserId) {
+        return baseMapper.selectConfigList(matterName, ids,status,guideUserId);
+    }
+
+    @Override
+    public int countConfigList(String matterName, List<String> ids,String status,String guideUserId) {
+        return baseMapper.countConfigList(matterName, ids,status,guideUserId);
     }
 
     @Override
@@ -262,8 +270,9 @@
     @Override
     public int countStatisticsNum(String state, List<String> ids, String time,
                                   String isTimeout, String evaluateState,
-                                  List<String> classifyIds,String serviceState) {
-        return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds,serviceState);
+                                  List<String> classifyIds,String serviceState,
+                                  String guideUserId) {
+        return baseMapper.countStatisticsNum(state, ids, time, isTimeout, evaluateState, classifyIds,serviceState,guideUserId);
     }
 
     @Override
@@ -340,5 +349,52 @@
         return baseMapper.deleteConfigById(Id);
     }
 
+    @Override
+    public ResultData pushOvertimeGuideRepairOrder() {
+        List<GuideRepairOrder> guideRepairOrders = baseMapper.selectOvertime();
+        WxUtil wxUtil = new WxUtil();
+        String accessToken = "0";
+        try {
+            accessToken = wxUtil.getBatteryCarAccessToken();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        for (GuideRepairOrder guideRepairOrder:guideRepairOrders) {
+            SysUser sysUser = sysUserMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getUserId, guideRepairOrder.getGuideUserId()));
+            if (sysUser!=null)
+            {
+                smsUtil.sendSmsOvertime(sysUser.getPhonenumber(), sysUser.getUserName());
+                wxUtil.sendGuideRepairOrderOvertime(sysUser.getOpenid(),accessToken,"86JgWHhR8b1XxD72WYqMnndyfkiMtSSoCk9NFMwLEZ8",sysUser);
+                guideRepairOrder.setIsPush(1);
+                guideRepairOrder.setIsTimeout("2");
+                baseMapper.updateById(guideRepairOrder);
+            }
+        }
+        return ResultData.success();
+    }
+
+    @Override
+    public int updateEvaluate() {
+        //查找一天没有评价的单据
+        List<GuideRepairOrder> guideRepairOrders = baseMapper.selectEvaluate();
+        for (GuideRepairOrder guideRepairOrder:guideRepairOrders) {
+            guideRepairOrder.setEvaluateState("1");
+            guideRepairOrder.setEvaluateContent("好评");
+            guideRepairOrder.setServiceState(1);
+            guideRepairOrder.setState("3");
+            baseMapper.updateById(guideRepairOrder);
+            //新增默认好评进展
+            GuideEvolveEntity entity = new GuideEvolveEntity();
+            entity.setCreateTime(LocalDateTime.now());
+            entity.setUpdateTime(LocalDateTime.now());
+            entity.setState("12");
+            entity.setFromUserId(guideRepairOrder.getSubmitUserId()+"");
+            entity.setGuideId(guideRepairOrder.getId().toString());
+            guideEvolveMapper.insertConfig(entity);
+
+        }
+        return 0;
+    }
+
 
 }

--
Gitblit v1.7.1