From 0467b2c78c12aba5922e5b900eed5205824e9220 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 15 八月 2025 09:44:33 +0800
Subject: [PATCH] bug修改
---
DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 42 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 661a089..5635a41 100644
--- a/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.api;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
@@ -11,8 +12,8 @@
import com.stylefeng.guns.modular.system.model.Driver;
import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.model.OrderPosition;
+import com.stylefeng.guns.modular.system.model.TransactionDetails;
import com.stylefeng.guns.modular.system.service.*;
-import com.stylefeng.guns.modular.system.util.ALiSendSms;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.util.qiniuyun.QNYAuth;
import com.stylefeng.guns.modular.system.warpper.*;
@@ -23,6 +24,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -54,9 +56,6 @@
private ICarService carService;
@Autowired
- private ALiSendSms aLiSendSms;
-
- @Autowired
private IOrderTaxiService orderTaxiService;
@Autowired
@@ -73,7 +72,8 @@
@Autowired
private IDriverOnlineService driverOnlineService;
-
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
/**
@@ -878,6 +878,7 @@
baseWarpper.setAmount(Double.valueOf(String.valueOf(map.get("amount"))));
baseWarpper.setName(String.valueOf(map.get("name")));
baseWarpper.setDay(String.valueOf(map.get("day")));
+ baseWarpper.setRemark(String.valueOf(map.get("remark")));
data.add(baseWarpper);
}
return ResultUtil.success(data);
@@ -969,6 +970,9 @@
case 5:
baseWarpper.setName("跨城小件物流");
break;
+ case 6:
+ baseWarpper.setName("平台充值");
+ break;
}
Map<String, Object> map1 = new HashMap<>();
switch (Integer.valueOf(map.get("orderType").toString())){
@@ -1017,11 +1021,39 @@
map1.put("roadTollMoney", 0);//过路费
map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
break;
+ case 6:
+ List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>()
+ .eq("type", 1)
+ .eq("userId", uid)
+ .eq("state", 1)
+ .eq("userType", 2)
+ .eq("orderType", 6));
+ if(!CollectionUtils.isEmpty(transactionDetails)){
+ baseWarpper.setAmount(transactionDetails.get(0).getMoney());
+ baseWarpper.setRemark(transactionDetails.get(0).getRemark());
+ }
+ break;
}
baseWarpper.setData(map1);
data.add(baseWarpper);
}
+ List<TransactionDetails> transactionDetails = transactionDetailsService.selectList(new EntityWrapper<TransactionDetails>()
+ .eq("type", 1)
+ .eq("userId", uid)
+ .eq("state", 1)
+ .eq("userType", 2)
+ .eq("orderType", 6));
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ for (TransactionDetails transactionDetail : transactionDetails) {
+ BaseWarpper baseWarpper = new BaseWarpper();
+ baseWarpper.setDay(format.format(transactionDetail.getInsertTime()));
+ baseWarpper.setAmount(transactionDetail.getMoney());
+ baseWarpper.setRemark(transactionDetail.getRemark());
+ baseWarpper.setName("平台充值");
+ baseWarpper.setData(new HashMap<>());
+ data.add(baseWarpper);
+ }
return ResultUtil.success(data);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1