修改bug

Pu Zhibing

2 天以前 5dacdee9b54c78372b68140e2b068d03a620eab9

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -78,18 +78,19 @@

    @Autowired
    private IPaymentRecordService paymentRecordService;

    
    @Autowired
    private IIncomeService incomeService;

    
    @Autowired
    private ITOrderLogisticsService orderLogisticsService;

    
    @Autowired
    private ITOrderTaxiService orderTaxiService;



    @Resource
    private ShiroExtUtil shiroExtUtil;
    
    
    /**
     * 跳转到快车改派管理首页
     */
@@ -202,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, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.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));
            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);
@@ -238,7 +239,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String, Object>> mapList = tReassignService.getPrivateCarReassignOrderListEx(ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.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++) {
@@ -310,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, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
        if(!list.isEmpty()){
            Map<String,Object> map = new HashMap<>();
        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));
            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);
@@ -346,7 +347,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String, Object>> mapList = tReassignService.getCrossReassignOrderListEx(ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.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++) {
@@ -412,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, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
        if(!list.isEmpty()){
            Map<String,Object> map = new HashMap<>();
        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));
            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);
@@ -455,7 +456,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String, Object>> mapList = tReassignService.getSmallPieceLogisticsListEx(ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.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++) {
@@ -527,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, ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.getUser().getObjectId(), beginTime, endTime, originalDriverName, originalDriverPhone, orderNum, nowDriverName, nowDriverPhone, orderState, state);
        if(!list.isEmpty()){
            Map<String,Object> map = new HashMap<>();
        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));
            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);
@@ -563,7 +564,7 @@
                beginTime = timeArray[0];
                endTime = timeArray[1];
            }
            List<Map<String, Object>> mapList = tReassignService.getTaxiReassignOrderListEx(ShiroExtUtil.getUser().getRoleType(), ShiroExtUtil.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++) {
@@ -686,16 +687,16 @@
    @RequestMapping(value = "/opt")
    @ResponseBody
    public Object opt(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        ShiroUser user = ShiroExtUtil.getUser();
        ShiroUser user = shiroExtUtil.getUser();
        TReassign tReassign = tReassignService.selectById(tReassignId);
        if (1 == optType){
        if (1 == optType) {
            Integer originalDriverId = tReassign.getOriginalDriverId();

        
            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);
            //还原订单状态
@@ -771,17 +772,17 @@
    public Object optCross(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        try {
            TReassign tReassign = tReassignService.selectById(tReassignId);
            ShiroUser user = ShiroExtUtil.getUser();
            if (1 == optType){


            ShiroUser user = shiroExtUtil.getUser();
            if (1 == optType) {
        
        
                Integer originalDriverId = tReassign.getOriginalDriverId();

        
                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);
@@ -934,17 +935,17 @@
    @ResponseBody
    public Object optSmall(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        try {
            ShiroUser user = ShiroExtUtil.getUser();
            ShiroUser user = shiroExtUtil.getUser();
            TReassign tReassign = tReassignService.selectById(tReassignId);
            if (1 == optType){
            if (1 == optType) {
                Integer originalDriverId = tReassign.getOriginalDriverId();

        
                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);

@@ -1063,12 +1064,12 @@
    @RequestMapping(value = "/optTaxi")
    @ResponseBody
    public Object optTaxi(@RequestParam Integer tReassignId,@RequestParam Integer optType) {
        ShiroUser user = ShiroExtUtil.getUser();
        ShiroUser user = shiroExtUtil.getUser();
        TReassign tReassign = tReassignService.selectById(tReassignId);
        if (1 == optType){

        if (1 == optType) {
        
            Integer originalDriverId = tReassign.getOriginalDriverId();

        
            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());