From 5dacdee9b54c78372b68140e2b068d03a620eab9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 七月 2025 19:00:52 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 187 +++++++++++++++-------------------------------
1 files changed, 60 insertions(+), 127 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 1ba2351..5d27d19 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -3,15 +3,12 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-import com.stylefeng.guns.core.shiro.ShiroKit;
+import com.stylefeng.guns.core.log.LogObjectHolder;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.ExcelUtil;
import com.stylefeng.guns.core.util.SinataUtil;
-import com.stylefeng.guns.core.util.ToolUtil;
-import com.stylefeng.guns.modular.cloudPayment.example.AllocationExample;
-import com.stylefeng.guns.modular.cloudPayment.req.AllocationReq;
-import com.stylefeng.guns.modular.system.controller.util.Base64Util;
import com.stylefeng.guns.modular.system.dao.LineShiftDriverMapper;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
@@ -19,18 +16,15 @@
import com.stylefeng.guns.modular.system.util.HttpRequestUtil;
import com.stylefeng.guns.modular.system.util.PushURL;
import com.stylefeng.guns.modular.system.util.ResultUtil;
-import com.unionpay.upyzt.exception.UpyztException;
-import com.unionpay.upyzt.resp.AllocationResp;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.stylefeng.guns.core.log.LogObjectHolder;
+import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
@@ -38,7 +32,10 @@
import java.math.BigDecimal;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 快车改派管理控制器
@@ -81,18 +78,19 @@
@Autowired
private IPaymentRecordService paymentRecordService;
-
+
@Autowired
private IIncomeService incomeService;
-
+
@Autowired
private ITOrderLogisticsService orderLogisticsService;
-
+
@Autowired
private ITOrderTaxiService orderTaxiService;
-
-
-
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
+
/**
* 跳转到快车改派管理首页
*/
@@ -205,11 +203,11 @@
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
//page.setRecords(tReassignService.getPrivateCarReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
- List<Map<String,Object>> list = tReassignService.getPrivateCarReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
- if(!list.isEmpty()){
- Map<String,Object> map = new HashMap<>();
- map.put("insertTime","改派金额合计");
- map.put("money",tReassignService.getPrivateCarReassignOrderListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
+ List<Map<String, Object>> list = tReassignService.getPrivateCarReassignOrderList(page, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
+ if(!list.isEmpty()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("insertTime", "改派金额合计");
+ map.put("money", tReassignService.getPrivateCarReassignOrderListMoney(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state));
list.add(map);
}
page.setRecords(list);
@@ -241,7 +239,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = tReassignService.getPrivateCarReassignOrderListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
+ List<Map<String, Object>> mapList = tReassignService.getPrivateCarReassignOrderListEx(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -313,11 +311,11 @@
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
//page.setRecords(tReassignService.getCrossReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
- List<Map<String,Object>> list = tReassignService.getCrossReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
- if(!list.isEmpty()){
- Map<String,Object> map = new HashMap<>();
- map.put("insertTime","改派金额合计");
- map.put("money",tReassignService.getCrossReassignOrderListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
+ List<Map<String, Object>> list = tReassignService.getCrossReassignOrderList(page, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
+ if(!list.isEmpty()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("insertTime", "改派金额合计");
+ map.put("money", tReassignService.getCrossReassignOrderListMoney(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state));
list.add(map);
}
page.setRecords(list);
@@ -349,7 +347,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = tReassignService.getCrossReassignOrderListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
+ List<Map<String, Object>> mapList = tReassignService.getCrossReassignOrderListEx(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -415,17 +413,17 @@
Integer state) {
String beginTime = null;
String endTime = null;
- if (SinataUtil.isNotEmpty(insertTime)){
+ if (SinataUtil.isNotEmpty(insertTime)) {
String[] timeArray = insertTime.split(" - ");
beginTime = timeArray[0];
endTime = timeArray[1];
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
- List<Map<String,Object>> list = tReassignService.getSmallPieceLogisticsList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
- if(!list.isEmpty()){
- Map<String,Object> map = new HashMap<>();
- map.put("insertTime","改派金额合计");
- map.put("money",tReassignService.getSmallPieceLogisticsListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
+ List<Map<String, Object>> list = tReassignService.getSmallPieceLogisticsList(page, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
+ if (!list.isEmpty()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("insertTime", "改派金额合计");
+ map.put("money", tReassignService.getSmallPieceLogisticsListMoney(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state));
list.add(map);
}
page.setRecords(list);
@@ -458,7 +456,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = tReassignService.getSmallPieceLogisticsListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
+ List<Map<String, Object>> mapList = tReassignService.getSmallPieceLogisticsListEx(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -530,11 +528,11 @@
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
//page.setRecords(tReassignService.getTaxiReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
- List<Map<String,Object>> list = tReassignService.getTaxiReassignOrderList(page,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
- if(!list.isEmpty()){
- Map<String,Object> map = new HashMap<>();
- map.put("insertTime","改派金额合计");
- map.put("money",tReassignService.getTaxiReassignOrderListMoney(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state));
+ List<Map<String, Object>> list = tReassignService.getTaxiReassignOrderList(page, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
+ if(!list.isEmpty()) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("insertTime", "改派金额合计");
+ map.put("money", tReassignService.getTaxiReassignOrderListMoney(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state));
list.add(map);
}
page.setRecords(list);
@@ -566,7 +564,7 @@
beginTime = timeArray[0];
endTime = timeArray[1];
}
- List<Map<String,Object>> mapList = tReassignService.getTaxiReassignOrderListEx(ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),beginTime,endTime,originalDriverName,originalDriverPhone,orderNum,nowDriverName,nowDriverPhone,orderState,state);
+ List<Map<String, Object>> mapList = tReassignService.getTaxiReassignOrderListEx(shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
String[][] values = new String[mapList.size()][];
for (int i = 0; i < mapList.size(); i++) {
@@ -689,23 +687,16 @@
@RequestMapping(value = "/opt")
@ResponseBody
public Object opt(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
TReassign tReassign = tReassignService.selectById(tReassignId);
- if (1 == optType){
+ if (1 == optType) {
Integer originalDriverId = tReassign.getOriginalDriverId();
- String allocationReq = createAllocationReq(1, originalDriverId, 1, tReassign.getMoney());
- if("error".equals(allocationReq)){
- return ResultUtil.error("该司机未进件");
- }
- if(!"ok".equals(allocationReq)){
- return ResultUtil.error(allocationReq);
- }
-
+
TDriver driver = itDriverService.selectById(originalDriverId);
driver.setBalance(driver.getBalance().add(new BigDecimal(tReassign.getMoney())));
driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).add(new BigDecimal(tReassign.getMoney())).doubleValue());
itDriverService.updateById(driver);
-
+
tReassign.setState(5);
tReassignService.updateById(tReassign);
//还原订单状态
@@ -768,43 +759,6 @@
private ITEnterpriseWithdrawalService tEnterpriseWithdrawalService;
@Autowired
private IUserWithdrawalService userWithdrawalService;
- public String createAllocationReq(Integer companyId,Integer userId,int type,double money){
- List<TEnterpriseWithdrawal> tEnterpriseWithdrawals = tEnterpriseWithdrawalService.selectList(new EntityWrapper<TEnterpriseWithdrawal>().eq("companyId", companyId));
- TDriver tUser = itDriverService.selectById(userId);
- List<UserWithdrawal> userWithdrawals = userWithdrawalService.selectList(new EntityWrapper<UserWithdrawal>().eq("phone", tUser.getPhone()));
- if(userWithdrawals.size()==0){
- return "error";
- }
-
- AllocationReq allocationReq= new AllocationReq();
- allocationReq.setOutOrderNo(ToolUtil.getRandomString(32));
- if(type==1){
-
- allocationReq.setPayBalanceAcctId(tEnterpriseWithdrawals.get(0).getBalanceAcctId());
- allocationReq.setRecvBalanceAcctId(userWithdrawals.get(0).getBalanceAcctId());
-
- allocationReq.setPassword(Base64Util.decode(tEnterpriseWithdrawals.get(0).getTransactionAuthorizationCode()));
- }else {
- allocationReq.setRecvBalanceAcctId(tEnterpriseWithdrawals.get(0).getBalanceAcctId());
- allocationReq.setPayBalanceAcctId(userWithdrawals.get(0).getBalanceAcctId());
- allocationReq.setPassword(Base64Util.decode(userWithdrawals.get(0).getTransactionAuthorizationCode()));
- }
- money=money*100;
- allocationReq.setAmount((int)money);
- allocationReq.setProductName("分账");
- allocationReq.setProductCount(1);
- allocationReq.setOrderNo(ToolUtil.getRandomString(32));
- allocationReq.setOrderAmount(1l);
- try {
- AllocationResp allocationResp = AllocationExample.create(allocationReq);
- System.out.println(allocationResp);
- return "ok";
- } catch (UpyztException e) {
- e.printStackTrace();
- return e.getMessage();
- }
-
- }
@Autowired
private ITPubTransactionDetailsService itPubTransactionDetailsService;
@@ -818,24 +772,17 @@
public Object optCross(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
try {
TReassign tReassign = tReassignService.selectById(tReassignId);
- ShiroUser user = ShiroKit.getUser();
- if (1 == optType){
-
-
+ ShiroUser user = shiroExtUtil.getUser();
+ if (1 == optType) {
+
+
Integer originalDriverId = tReassign.getOriginalDriverId();
- String allocationReq = createAllocationReq(1, originalDriverId, 1, tReassign.getMoney());
- if("error".equals(allocationReq)){
- return ResultUtil.error("该司机未进件");
- }
- if(!"ok".equals(allocationReq)){
- return ResultUtil.error(allocationReq);
- }
-
+
TDriver driver = itDriverService.selectById(originalDriverId);
driver.setBalance(driver.getBalance().add(new BigDecimal(tReassign.getMoney())));
driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).add(new BigDecimal(tReassign.getMoney())).doubleValue());
itDriverService.updateById(driver);
-
+
tReassign.setState(5);
tReassign.setReviewer(user.getId());
tReassign.setReviewerType(2);
@@ -988,24 +935,17 @@
@ResponseBody
public Object optSmall(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
try {
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
TReassign tReassign = tReassignService.selectById(tReassignId);
- if (1 == optType){
+ if (1 == optType) {
Integer originalDriverId = tReassign.getOriginalDriverId();
- String allocationReq = createAllocationReq(1, originalDriverId, 1, tReassign.getMoney());
- if("error".equals(allocationReq)){
- return ResultUtil.error("该司机未进件");
- }
- if(!"ok".equals(allocationReq)){
- return ResultUtil.error(allocationReq);
- }
-
+
TDriver driver = itDriverService.selectById(originalDriverId);
driver.setBalance(driver.getBalance().add(new BigDecimal(tReassign.getMoney())));
driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).add(new BigDecimal(tReassign.getMoney())).doubleValue());
itDriverService.updateById(driver);
-
-
+
+
tReassign.setState(5);
tReassignService.updateById(tReassign);
@@ -1124,19 +1064,12 @@
@RequestMapping(value = "/optTaxi")
@ResponseBody
public Object optTaxi(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
TReassign tReassign = tReassignService.selectById(tReassignId);
- if (1 == optType){
-
+ if (1 == optType) {
+
Integer originalDriverId = tReassign.getOriginalDriverId();
- String allocationReq = createAllocationReq(1, originalDriverId, 1, tReassign.getMoney());
- if("error".equals(allocationReq)){
- return ResultUtil.error("该司机未进件");
- }
- if(!"ok".equals(allocationReq)){
- return ResultUtil.error(allocationReq);
- }
-
+
TDriver driver = itDriverService.selectById(originalDriverId);
driver.setBalance(driver.getBalance().add(new BigDecimal(tReassign.getMoney())));
driver.setLaveBusinessMoney(new BigDecimal(driver.getLaveBusinessMoney()).add(new BigDecimal(tReassign.getMoney())).doubleValue());
--
Gitblit v1.7.1