From 7feb722a12e26f5572c7df9ccc1ce8c1e26b9f94 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 四月 2025 23:30:07 +0800
Subject: [PATCH] 新增加功能
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java | 87 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 6 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
index 3dcf708..10d2742 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderTaxiServiceImpl.java
@@ -1,12 +1,11 @@
package com.stylefeng.guns.modular.system.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.modular.system.model.TOrderPosition;
-import com.stylefeng.guns.modular.system.model.TOrderTaxi;
-import com.stylefeng.guns.modular.system.dao.TOrderTaxiMapper;
-import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.stylefeng.guns.modular.system.util.ResultUtil;
+import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.dao.TOrderTaxiMapper;
+import com.stylefeng.guns.modular.system.model.TOrderTaxi;
+import com.stylefeng.guns.modular.system.service.ITOrderTaxiService;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -52,5 +51,81 @@
public Double getAllIncomeMoney(Integer companyId, String beginTime, String endTime) {
return this.baseMapper.getAllIncomeMoney(companyId, beginTime, endTime);
}
-
+
+
+ /**
+ * 获取支付订单统计数据
+ * @param page
+ * @param paymentCode
+ * @param orderCode
+ * @param userPhone
+ * @param driverPhone
+ * @param createTime
+ * @param paymentTime
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> paymentOrderStatisticsList(Page<Map<String, Object>> page, String paymentCode, String orderCode, String userPhone, String driverPhone, String createTime, String paymentTime) {
+ String createTimeStart = null;
+ String createTimeEnd = null;
+ String paymentTimeStart = null;
+ String paymentTimeEnd = null;
+ if(ToolUtil.isNotEmpty(createTime)){
+ String[] split = createTime.split(" - ");
+ createTimeStart = split[0];
+ createTimeEnd = split[1];
+ }
+ if(ToolUtil.isNotEmpty(paymentTime)){
+ String[] split = paymentTime.split(" - ");
+ paymentTimeStart = split[0];
+ paymentTimeEnd = split[1];
+ }
+ return this.baseMapper.paymentOrderStatisticsList(page, paymentCode, orderCode, userPhone, driverPhone, createTimeStart, createTimeEnd, paymentTimeStart, paymentTimeEnd);
+ }
+
+ /**
+ * 获取线下订单统计数据
+ * @param page
+ * @param orderCode
+ * @param userPhone
+ * @param driverPhone
+ * @param createTime
+ * @param orderSource
+ * @return
+ */
+ @Override
+ public List<Map<String, Object>> offlineOrderStatisticsList(Page<Map<String, Object>> page, String orderCode, String userPhone, String driverPhone, String createTime, Integer orderSource) {
+ String createTimeStart = null;
+ String createTimeEnd = null;
+ if(ToolUtil.isNotEmpty(createTime)){
+ String[] split = createTime.split(" - ");
+ createTimeStart = split[0];
+ createTimeEnd = split[1];
+ }
+ List<Map<String, Object>> list = this.baseMapper.offlineOrderStatisticsList(page, orderCode, userPhone, driverPhone, createTimeStart, createTimeEnd, orderSource);
+ for (Map<String, Object> map : list) {
+ Integer orderSource1 = null;
+ if(null != map.get("orderSource")){
+ orderSource1 = Integer.valueOf(map.get("orderSource").toString());
+ }
+ Integer oldPeople = null;
+ if(null != map.get("oldPeople")){
+ oldPeople = Integer.valueOf(map.get("oldPeople").toString());
+ }
+ Integer payManner = null;
+ if(null != map.get("payManner")){
+ payManner = Integer.valueOf(map.get("payManner").toString());
+ }
+ if(6 == orderSource1){
+ map.put("orderSource", "电话订单");
+ }else if(5 == orderSource1){
+ map.put("orderSource", "平台下单");
+ }else if(1 == oldPeople){
+ map.put("orderSource", "一键下单");
+ }else if(2 == payManner){
+ map.put("orderSource", "普通订单-打表计费");
+ }
+ }
+ return list;
+ }
}
--
Gitblit v1.7.1