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/TOrderLogisticsController.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
index 01bf626..409724e 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderLogisticsController.java
@@ -57,18 +57,21 @@
@Autowired
private IIncomeService incomeService;
-
+
@Autowired
private ITDriverService tDriverService;
-
+
@Autowired
private ITTimeoutAppealService timeoutAppealService;
-
+
@Autowired
private PayMoneyUtil payMoneyUtil;
@Autowired
private IUserCouponRecordService userCouponRecordService;
-
+
+ @Resource
+ private ShiroExtUtil shiroExtUtil;
+
/**
* 跳转到小件物流订单首页
*/
@@ -76,7 +79,7 @@
public String index() {
return PREFIX + "tOrderLogistics.html";
}
-
+
/**
* 跳转到添加小件物流订单
*/
@@ -118,13 +121,13 @@
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();
- page.setRecords(tOrderLogisticsService.getLogisticsOrderList(page, beginTime, endTime, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId(),
+ page.setRecords(tOrderLogisticsService.getLogisticsOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
orderNum, orderSource, type, userName, userPhone, recipient, recipientPhone, driver, state));
return super.packForBT(page);
}
@@ -138,14 +141,14 @@
@RequestMapping(value = "/cancel")
@ResponseBody
public Object cancel(@RequestParam Integer tOrderLogisticsId) {
- try{
- ShiroUser user = ShiroExtUtil.getUser();
+ try {
+ ShiroUser user = shiroExtUtil.getUser();
TOrderLogistics tOrderLogistics = tOrderLogisticsService.selectById(tOrderLogisticsId);
tOrderLogistics.setState(10);
-
+
//已支付的情况下进行退款操作
- if(null != tOrderLogistics.getPayType() && null != tOrderLogistics.getPayMoney()) {
- if (tOrderLogistics.getPayType() ==3) {//余额支付
+ if (null != tOrderLogistics.getPayType() && null != tOrderLogistics.getPayMoney()) {
+ if (tOrderLogistics.getPayType() == 3) {//余额支付
TUser tUser = userService.selectById(tOrderLogistics.getUserId());
tUser.setBalance(tUser.getBalance().add(tOrderLogistics.getPayMoney()));
userService.updateById(tUser);
--
Gitblit v1.7.1