From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index 6384320..9f72853 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -1,6 +1,6 @@
 package com.stylefeng.guns.modular.system.service.impl;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.stylefeng.guns.core.shiro.ShiroKit;
 import com.stylefeng.guns.modular.system.controller.resp.DataStatisticsOrderYearResp;
 import com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp;
@@ -9,14 +9,13 @@
 import com.stylefeng.guns.modular.system.dao.TAppUserMapper;
 import com.stylefeng.guns.modular.system.dao.TBranchOfficeMapper;
 import com.stylefeng.guns.modular.system.dao.TDriverMapper;
+import com.stylefeng.guns.modular.system.dao.TOrderMapper;
 import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
 import com.stylefeng.guns.modular.system.model.TAppUser;
 import com.stylefeng.guns.modular.system.model.TBranchOffice;
 import com.stylefeng.guns.modular.system.model.TDriver;
 import com.stylefeng.guns.modular.system.model.TOrder;
-import com.stylefeng.guns.modular.system.dao.TOrderMapper;
 import com.stylefeng.guns.modular.system.service.ITOrderService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.stylefeng.guns.modular.system.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -56,8 +55,8 @@
         // 开始,结束时间
         if(StringUtils.hasLength(createTime)){
             String[] split = createTime.split(" - ");
-            startTime = split[0];
-            endTime = split[1];
+            startTime = split[0] + " 00:00:00";
+            endTime = split[1] + " 23:59:59";
         }
         Integer roleType = Objects.requireNonNull(ShiroKit.getUser()).getRoleType();
         Integer objectId = Objects.requireNonNull(ShiroKit.getUser()).getObjectId();
@@ -95,7 +94,7 @@
         }
         model.addAttribute("startPrice",tOrder.getStartPrice());//起步价
         model.addAttribute("overDrivePrice",tOrder.getOverDrivePrice());//里程费
-        model.addAttribute("waitTimePrice",tOrder.getWaitTimePrice());//等待费
+        model.addAttribute("waitTimePrice",tOrder.getWaitTimePrice().add(tOrder.getOutWaitTimePrice()));//等待费
         model.addAttribute("badWeatherPrice",tOrder.getBadWeatherPrice());//恶劣天气费用
         model.addAttribute("orderMoney",tOrder.getOrderMoney());//实际费用
         model.addAttribute("payMoney",tOrder.getPayMoney());//实际支付费用
@@ -345,4 +344,11 @@
         model.addAttribute("monthResp",resps);
         map.put("monthResp",resps);
     }
+
+
+    @Override
+    public Integer getValidOrderCount(Integer driverId, BigDecimal orderMoney, String month) {
+        // 查询司机当月有效订单数量
+        return tOrderMapper.getValidOrderCount(driverId,orderMoney,month);
+    }
 }

--
Gitblit v1.7.1