From d6c02727ff5005990c704873668769ee2c6375b4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 17:16:49 +0800
Subject: [PATCH] 开发2.0功能
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 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 5d1b79f..a91c5ad 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();
@@ -77,6 +76,8 @@
model.addAttribute("endAddress",tOrder.getEndAddress());//终点
model.addAttribute("endLng",tOrder.getEndLng());// 终点经度
model.addAttribute("endLat",tOrder.getEndLat());// 终点纬度
+ model.addAttribute("boardingAddress", tOrder.getBoardingAddress());//上车点
+ model.addAttribute("debusAddress", tOrder.getDebusAddress());//下车点
if(Objects.nonNull(tOrder.getStartTime())){
model.addAttribute("startTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tOrder.getStartTime()));//乘车时间
@@ -204,9 +205,9 @@
@Override
public void getDataStatisticsCountByIds(List<Integer> ids, Model model) {
- Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.PENDING_ORDER.getCode(), LocalDate.now());
- Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.FINISH.getCode(),LocalDate.now());
- Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.CANCELED.getCode(),LocalDate.now());
+ Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, 1, LocalDate.now());
+ Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, 2,LocalDate.now());
+ Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, 3,LocalDate.now());
Integer serverCount = tOrderMapper.getDataStatisticsServerCountByIds(ids, LocalDate.now());
model.addAttribute("pendingOrderCount",pendingOrderCount);
@@ -241,9 +242,9 @@
@Override
public void getDataStatisticsCountByIdsGetMap(List<Integer> ids, HashMap<String, Object> map) {
- Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.PENDING_ORDER.getCode(), LocalDate.now());
- Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.FINISH.getCode(),LocalDate.now());
- Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, OrderStateEnum.CANCELED.getCode(),LocalDate.now());
+ Integer pendingOrderCount = tOrderMapper.getDataStatisticsCountByIds(ids, 1, LocalDate.now());
+ Integer finishCount = tOrderMapper.getDataStatisticsCountByIds(ids, 2,LocalDate.now());
+ Integer cancelCount = tOrderMapper.getDataStatisticsCountByIds(ids, 3,LocalDate.now());
Integer serverCount = tOrderMapper.getDataStatisticsServerCountByIds(ids, LocalDate.now());
map.put("pendingOrderCount",pendingOrderCount);
@@ -345,4 +346,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