From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 73 ++++++++++++++++--------------------
1 files changed, 33 insertions(+), 40 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 0169e04..d38d967 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,28 @@
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;
public static void main(String[] args) {
// 获取今天的日期
@@ -99,7 +94,18 @@
}
+ /**
+ * 跳转到首页
+ */
+ @RequestMapping("/commission")
+ public String index( Model model) {
+ return PREFIX + "commission.html";
+ }
+ @RequestMapping("/water")
+ public String watter( Model model) {
+ return PREFIX + "watter.html";
+ }
/**
*
@@ -1042,20 +1048,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) {
@@ -1801,7 +1794,11 @@
}
EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
-// settlementDetailEntityWrapper.between("createTime", start, end);
+ 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){
@@ -1813,16 +1810,10 @@
}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()))
- .or().isNull("settlementRecordId");;
+ settlementDetailEntityWrapper.in("settlementRecordId", paymentStatus.stream().map(SettlementRecord::getId).collect(Collectors.toList()));
}else{
settlementDetailEntityWrapper.eq("settlementRecordId", 0);
}
- }
- if (time == 5 && !StringUtils.hasLength(insertTime)){
-
- }else{
- settlementDetailEntityWrapper.between("createTime", start, end);
}
settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
List<PlatformVO> res = new ArrayList<>();
@@ -1927,6 +1918,8 @@
break;
case 4:
platformVO.setPayType("现金支付");
+ case 5:
+ platformVO.setPayType("平台支付");
break;
}
}
--
Gitblit v1.7.1