From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 232 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 144 insertions(+), 88 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index af20a78..ab74953 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -2,9 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
-import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -12,8 +10,6 @@
import com.stylefeng.guns.modular.system.vo.PlatformVO;
import com.stylefeng.guns.modular.system.vo.WaterMoneyVO;
import com.stylefeng.guns.modular.system.vo.WaterVO;
-import io.swagger.models.auth.In;
-import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -21,13 +17,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.*;
-import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,26 +41,31 @@
private ITOrderPrivateCarService orderPrivateCarService;
@Autowired
private ITOrderLogisticsService orderLogisticsService;
- /**
- * 跳转到首页
- */
- @RequestMapping("/commission")
- public String index( Model model) {
- return PREFIX + "commission.html";
- }
- @RequestMapping("/water")
- public String watter( Model model) {
- return PREFIX + "watter.html";
- }
@Autowired
private IIncomeService incomeService;
@Autowired
private ISettlementRecordService settlementRecordService;
-
@Autowired
private ISettlementDetailService settlementDetailService;
@Autowired
private ITDriverService driverService;
+ /**
+ * 第三方流水统计获取列表
+ */
+
+ @Autowired
+ private ITPubTransactionDetailsService pubTransactionDetailsService;
+ @Autowired
+ private ITPubWithdrawalService pubWithdrawalService;
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
+ @Autowired
+ private ITUserService appUserService;
+ @Autowired
+ private IOrderCancelService orderCancelService;
+
+ @Autowired
+ private ITCompanyService companyService;
public static void main(String[] args) {
// 获取今天的日期
@@ -99,7 +97,20 @@
}
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("/commission")
+ public String index( Model model) {
+ List<TCompany> tCompanies = companyService.selectList(new EntityWrapper<TCompany>().eq("state", 0).ne("flag", 3));
+ model.addAttribute("company", tCompanies);
+ return PREFIX + "commission.html";
+ }
+ @RequestMapping("/water")
+ public String watter( Model model) {
+ return PREFIX + "watter.html";
+ }
/**
*
@@ -111,7 +122,7 @@
*/
@RequestMapping(value = "/commission/getCount")
@ResponseBody
- public Object getCount(Integer time,String insertTime,Integer state) {
+ public Object getCount(Integer time,String insertTime,Integer state, Integer company) {
if (time == null){
time =1;
}
@@ -175,22 +186,33 @@
if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- settlementDetailEntityWrapper.between("createTime", start, end);
if (state!=null && state == 2){
- settlementDetailEntityWrapper.eq("paymentStatus", 2);
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
+ }else if (state!=null && state == 1){
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
}
if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -200,12 +222,16 @@
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
List<PlatformVO> res = new ArrayList<>();
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- Map<Integer, TDriver> driverMap = driverService.selectList(new EntityWrapper<TDriver>())
- .stream()
- .collect(Collectors.toMap(TDriver::getId, user -> user));
+
Map<Integer, SettlementRecord> settlementRecordMap = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>())
.stream()
.collect(Collectors.toMap(SettlementRecord::getId, user -> user));
+ Map<Integer, TOrderPrivateCar> orderPrivateCarMap = orderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>())
+ .stream()
+ .collect(Collectors.toMap(TOrderPrivateCar::getId, user -> user));
+ Map<Integer, TOrderLogistics> orderLogisticsRecordMap = orderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>())
+ .stream()
+ .collect(Collectors.toMap(TOrderLogistics::getId, user -> user));
// 已结算金额
BigDecimal balance = new BigDecimal("0");
// 未结算金额
@@ -221,14 +247,13 @@
}
// 查询订单信息
// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
-
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(income.getIncomeId());
if (tOrderPrivateCar==null){
continue;
}
-
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
+ continue;
+ }
platformVO.setMoney(new BigDecimal(income.getMoney()));
if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
continue;
@@ -244,13 +269,15 @@
// 小件物流
// 查询订单信息
// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
+
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(income.getIncomeId());
+
if (tOrderLogistics==null){
continue;
}
-
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
+ continue;
+ }
platformVO.setMoney(new BigDecimal(income.getMoney()));
if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
@@ -268,11 +295,12 @@
switch (settlementDetail.getOrderType()){
case 1:
// 专车订单
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(settlementDetail.getOrderId());
+
if (tOrderPrivateCar==null){
+ continue;
+ }
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
@@ -310,11 +338,12 @@
case 4:
// 小件物流
// 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(settlementDetail.getOrderId());
+
if (tOrderLogistics==null){
+ continue;
+ }
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
continue;
}
String string1 = settlementDetail.getPrice().toString();
@@ -1034,20 +1063,7 @@
waterMoneyVO.setUserWithdrawal(userWithdrawal);
return waterMoneyVO;
}
- /**
- * 第三方流水统计获取列表
- */
- @Autowired
- private ITPubTransactionDetailsService pubTransactionDetailsService;
- @Autowired
- private ITPubWithdrawalService pubWithdrawalService;
- @Autowired
- private IPaymentRecordService paymentRecordService;
- @Autowired
- private ITUserService appUserService;
- @Autowired
- private IOrderCancelService orderCancelService;
@RequestMapping(value = "/water/list")
@ResponseBody
public Object list1(Integer time,String insertTime,Integer payType,Integer type, String code) {
@@ -1715,7 +1731,7 @@
*/
@RequestMapping(value = "/commission/list")
@ResponseBody
- public Object list(Integer time,String insertTime,Integer state) {
+ public Object list(Integer time,String insertTime,Integer state, Integer company) {
if (time == null){
time =1;
@@ -1775,33 +1791,44 @@
break;
}
}
- Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
List<Income> incomes = new ArrayList<>();
List<SettlementDetail> settlementDetails = new ArrayList<>();
if (time == 5 && !StringUtils.hasLength(insertTime)){
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType"));
}else{
incomes = tIncomeService.selectList(new EntityWrapper<Income>()
.eq("userType", 1)
- .eq("objectId",1)
+ .eq(null != company, "objectId",company)
.ne("type", 1)
.isNotNull("orderType")
.between("insertTime", start, end));
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
- settlementDetailEntityWrapper.between("createTime", start, end);
- if (state!=null && state == 2){
- settlementDetailEntityWrapper.eq("paymentStatus", 2);
- }
if (time == 5 && !StringUtils.hasLength(insertTime)){
-
+
}else{
settlementDetailEntityWrapper.between("createTime", start, end);
+ }
+ if (state!=null && state == 2){
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 1));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()))
+ .or().isNull("settlementRecordId");
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
+ }else if (state!=null && state == 1){
+ List<SettlementRecord> paymentStatus = settlementRecordService.selectList(new EntityWrapper<SettlementRecord>().eq("paymentStatus", 2));
+ if(paymentStatus.size() > 0){
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
+ }else{
+ settlementDetailEntityWrapper.eq("settlementRecordId", 0);
+ }
}
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
List<PlatformVO> res = new ArrayList<>();
@@ -1818,6 +1845,30 @@
Map<Integer, SettlementDetail> settlementDetailMap = settlementDetailService.selectList(new EntityWrapper<SettlementDetail>())
.stream()
.collect(Collectors.toMap(SettlementDetail::getId, user -> user));
+ Map<Integer, TOrderPrivateCar> orderPrivateCarMap = orderPrivateCarService.selectList(new EntityWrapper<TOrderPrivateCar>())
+ .stream()
+ .collect(Collectors.toMap(TOrderPrivateCar::getId, user -> user));
+ Map<Integer, TOrderLogistics> orderLogisticsRecordMap = orderLogisticsService.selectList(new EntityWrapper<TOrderLogistics>())
+ .stream()
+ .collect(Collectors.toMap(TOrderLogistics::getId, user -> user));
+ // 专车取消订单
+ Map<Integer, OrderCancel> orderCancelRecordMap1 = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
+ .eq("orderType",1)
+ .eq("state",2)
+ .isNotNull("payType")
+ .isNotNull("money")
+ )
+ .stream()
+ .collect(Collectors.toMap(OrderCancel::getOrderId, user -> user));
+ // 小件物流取消
+ Map<Integer, OrderCancel> orderCancelRecordMap2 = orderCancelService.selectList(new EntityWrapper<OrderCancel>()
+ .eq("state",2)
+ .isNotNull("payType")
+ .isNotNull("money")
+ .eq("orderType",4)
+ )
+ .stream()
+ .collect(Collectors.toMap(OrderCancel::getOrderId, user -> user));
// 已结算金额
BigDecimal balance = new BigDecimal("0");
// 未结算金额
@@ -1832,12 +1883,12 @@
continue;
}
// 查询订单信息
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getIncomeId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(income.getIncomeId());
if (tOrderPrivateCar==null){
+ continue;
+ }
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
@@ -1857,9 +1908,7 @@
}
if (tOrderPrivateCar.getState() == 10){
// 查询取消订单 用户支付方式
- OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
- .eq("orderType", 1)
- .eq("orderId", tOrderPrivateCar.getId()));
+ OrderCancel orderCancel = orderCancelRecordMap1.get(tOrderPrivateCar.getId());
if (orderCancel!=null &&orderCancel.getPayType()!=null){
switch (orderCancel.getPayType()){
case 1:
@@ -1887,6 +1936,8 @@
break;
case 4:
platformVO.setPayType("现金支付");
+ case 5:
+ platformVO.setPayType("平台支付");
break;
}
}
@@ -1904,11 +1955,13 @@
}
// 小件物流
// 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(income.getIncomeId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", income.getIncomeId())
- .between("insertTime", start, end));
+//
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(income.getIncomeId());
+
if (tOrderLogistics==null){
+ continue;
+ }
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
continue;
}
platformVO.setCode(tOrderLogistics.getOrderNum());
@@ -1928,9 +1981,9 @@
}
if (tOrderLogistics.getState() == 10){
// 查询取消订单 用户支付方式
- OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
- .eq("orderType", 4)
- .eq("orderId", tOrderLogistics.getId()));
+
+ OrderCancel orderCancel = orderCancelRecordMap2.get(tOrderLogistics.getId());
+
if (orderCancel!=null &&orderCancel.getPayType()!=null){
switch (orderCancel.getPayType()){
case 1:
@@ -1975,11 +2028,13 @@
switch (settlementDetail.getOrderType()){
case 1:
// 专车订单
-// TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(settlementDetail.getOrderId());
- TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectOne(new EntityWrapper<TOrderPrivateCar>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderPrivateCar tOrderPrivateCar = orderPrivateCarMap.get(settlementDetail.getOrderId());
+
if (tOrderPrivateCar==null){
+ continue;
+ }
+
+ if(null != company && !company.equals(tOrderPrivateCar.getCompanyId())){
continue;
}
platformVO.setCode(tOrderPrivateCar.getOrderNum());
@@ -2024,13 +2079,14 @@
case 4:
// 小件物流
// 查询订单信息
-// TOrderLogistics tOrderLogistics = orderLogisticsService.selectById(settlementDetail.getOrderId());
- TOrderLogistics tOrderLogistics = orderLogisticsService.selectOne(new EntityWrapper<TOrderLogistics>()
- .eq("id", settlementDetail.getOrderId())
- .between("insertTime", start, end));
+ TOrderLogistics tOrderLogistics = orderLogisticsRecordMap.get(settlementDetail.getOrderId());
if (tOrderLogistics==null){
continue;
}
+
+ if(null != company && !company.equals(tOrderLogistics.getCompanyId())){
+ continue;
+ }
platformVO.setCode(tOrderLogistics.getOrderNum());
TDriver tDriver1 = driverMap.get(tOrderLogistics.getDriverId());
if (tDriver1!=null){
--
Gitblit v1.7.1