From c90f8fa92c935e02b53e973fbb5800f966bcbbfb Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期六, 11 十月 2025 17:20:32 +0800 Subject: [PATCH] 添加日志记录 --- ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarConfirmController.java | 44 ++++++++++++++------------------------------ 1 files changed, 14 insertions(+), 30 deletions(-) diff --git a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarConfirmController.java b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarConfirmController.java index c8b6f9d..ca33557 100644 --- a/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarConfirmController.java +++ b/ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarConfirmController.java @@ -1,9 +1,11 @@ package com.stylefeng.guns.modular.system.controller.specialTrain; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; 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.base.tips.ErrorTip; import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.core.shiro.ShiroKit; import com.stylefeng.guns.core.util.DateUtil; @@ -52,23 +54,16 @@ @Autowired private ITServerCarmodelService tServerCarmodelService; - @Autowired - private ITOrderPositionService tOrderPositionService; - - @Autowired - private ITDriverService tDriverService; - - @Autowired - private PushMinistryOfTransportUtil pushMinistryOfTransportUtil; - - @Resource - private OrderCancelMapper orderCancelMapper; - - @Value("${pushMinistryOfTransport}") - private boolean pushMinistryOfTransport; - @Value("${filePath}") private String filePath; + + private ResultUtil resultUtil; + + @Autowired + private IAppOperationLogService appOperationLogService; + + @Autowired + private PushUtil pushUtil; /** @@ -138,8 +133,6 @@ - private ResultUtil resultUtil; - /** * 获取订单轨迹 * @param orderDetailId @@ -179,20 +172,7 @@ return resultUtil; } - @Autowired - private ITCompanyService companyService; - @Autowired - private ITDriverService driverService; - - @Autowired - private IIncomeService incomeService; - - - - - @Autowired - private PushUtil pushUtil; /** * 支付专车订单 */ @@ -200,12 +180,16 @@ @ResponseBody public Object confirmMoney(Integer id,BigDecimal money) { TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(id); + if(6 != orderPrivateCar.getState()){ + return new ErrorTip(500, "订单状态不支持此操作"); + } orderPrivateCar.setAbnormalMoney(orderPrivateCar.getOrderMoney()); orderPrivateCar.setOrderMoney(money); orderPrivateCar.setIsException(0); orderPrivateCar.setPriceAuditState(2); orderPrivateCar.setState(7); orderPrivateCar.updateById(); + appOperationLogService.addAppOperationLog(ShiroKit.getUser().getId(), "{\"type\":\"调度确认费用\",\"orderId\":\"" + orderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(orderPrivateCar) + "\"}"); // 推送消息 TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar; -- Gitblit v1.7.1