添加日志记录

Pu Zhibing

21 小时以前 c90f8fa92c935e02b53e973fbb5800f966bcbbfb

 ManagementZYTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java

@@ -1,5 +1,6 @@
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;
@@ -10,6 +11,7 @@
import com.stylefeng.guns.core.util.ExcelExportUtil;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.controller.util.PushUtil;
import com.stylefeng.guns.modular.system.dao.OrderCancelMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -78,9 +80,22 @@
    @RequestMapping("")
    public String index(Model model) {
        //服务专车车型
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1)
               );
        model.addAttribute("carmodelList",carmodelList);
        return PREFIX + "tOrderPrivateCar.html";
    }


    /**
     * 跳转到专车订单首页
     */
    @RequestMapping("/abnormalOrder")
    public String abnormalOrder(Model model) {
        //服务专车车型
        List<TServerCarmodel> carmodelList = tServerCarmodelService.selectList(new EntityWrapper<TServerCarmodel>().eq("type", 1).eq("state", 1));
        model.addAttribute("carmodelList",carmodelList);
        return PREFIX + "tAbnormalOrder.html";
    }

    /**
@@ -95,12 +110,22 @@
    /**
     * 跳转到修改专车订单
     */
    @RequestMapping("/tOrderPrivateCar_orderDetailByOrderNumber/{orderNumber}")
    public String tOrderPrivateCarUpdate(@PathVariable String orderNumber, Model model) {
        Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailByOrderNumber(orderNumber);
        model.addAttribute("item",item);
        return PREFIX + "tOrderPrivateCar_orderDetail.html";
    }
    /**
     * 跳转到修改专车订单
     */
    @RequestMapping("/toChangeMoney/{tOrderPrivateCarId}")
    public String toChangeMoney(@PathVariable Integer tOrderPrivateCarId, Model model) {
        Map<String, Object> item = tOrderPrivateCarService.getPrivateCarOrderDetailById(tOrderPrivateCarId);
        model.addAttribute("item",item);
        return PREFIX + "toChangeMoney.html";
    }

    /**
     * 跳转到出租车订单轨迹页面
     */
@@ -135,6 +160,35 @@
        }
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
        return super.packForBT(page);
    }


    /**
     * 获取专车订单列表
     */
    @RequestMapping(value = "/abnormalList")
    @ResponseBody
    public Object abnormalList(String insertTime,
                       String orderNum,
                       Integer orderSource,
                       String userName,
                       String userPhone,
                       String passengers,
                       String passengersPhone,
                       Integer serverCarModelId,
                       String driver,
                       Integer state,
                       Integer smsNumber) {
        String beginTime = null;
        String endTime = null;
        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(tOrderPrivateCarService.getAbnormalOrderList(page,beginTime,endTime,ShiroKit.getUser().getRoleType(),ShiroKit.getUser().getObjectId(),orderNum,orderSource,userName,userPhone,passengers,passengersPhone,serverCarModelId,driver,state,smsNumber));
        return super.packForBT(page);
    }

@@ -188,6 +242,9 @@
    @Autowired
    private IIncomeService incomeService;

    @Autowired
    private IAppOperationLogService appOperationLogService;



    /**
@@ -200,9 +257,9 @@
        orderPrivateCar.setAbnormalMoney(orderPrivateCar.getOrderMoney());
        orderPrivateCar.setOrderMoney(money);
        orderPrivateCar.updateById();
        appOperationLogService.addAppOperationLog(ShiroKit.getUser().getId(), "{\"type\":\"调度修改订单金额\",\"orderId\":\"" + orderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(orderPrivateCar) + "\"}");
        return SUCCESS_TIP;
    }


    @RequestMapping(value = "/frozenOrder")
    @ResponseBody
@@ -255,7 +312,7 @@
        if(orderPrivateCar.getIsplatPay()==2){
            return "error";
        }
    //添加已收入明细
        //添加已收入明细
        TCompany company = companyService.selectById(orderPrivateCar.getCompanyId());
        Double taxi = company.getSpeMoney().doubleValue();
        BigDecimal d = null;//企业收入
@@ -277,7 +334,9 @@
        driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN));
        driverService.updateById(driver);
        orderPrivateCar.setIsplatPay(2);
        orderPrivateCar.setState(8);
        tOrderPrivateCarService.updateAllColumnById(orderPrivateCar);
        appOperationLogService.addAppOperationLog(ShiroKit.getUser().getId(), "{\"type\":\"调度修改订单已完成\",\"orderId\":\"" + orderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(orderPrivateCar) + "\"}");
        return SUCCESS_TIP;
    }

@@ -298,6 +357,7 @@

        tOrderPrivateCar.setState(10);
        tOrderPrivateCarService.updateById(tOrderPrivateCar);
        appOperationLogService.addAppOperationLog(ShiroKit.getUser().getId(), "{\"type\":\"调度取消订单\",\"orderId\":\"" + tOrderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(tOrderPrivateCar) + "\"}");

        OrderCancel orderCancel = new OrderCancel();
        orderCancel.setOrderId(tOrderPrivateCarId);
@@ -337,6 +397,7 @@
        TOrderPrivateCar tOrderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId);
        tOrderPrivateCar.setIsDelete(2);
        tOrderPrivateCarService.updateById(tOrderPrivateCar);
        appOperationLogService.addAppOperationLog(ShiroKit.getUser().getId(), "{\"type\":\"调度删除订单\",\"orderId\":\"" + tOrderPrivateCar.getId() + "\",\"orderInfo\":\"" + JSON.toJSONString(tOrderPrivateCar) + "\"}");
        return SUCCESS_TIP;
    }