Merge remote-tracking branch 'origin/master'

Pu Zhibing

昨天 f6f4e7beea525f0c450d618fdc93f112c6813edc

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

@@ -203,7 +203,7 @@
            Object o2 = item.get("responsibilityType");
            if(o2!=null){
                if(Integer.valueOf(o2.toString())>2){
                    TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum", item.get("orderNum")));
                    TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum", tOrderPrivateCarId));
                    model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
                }
            }
@@ -234,7 +234,7 @@
            model.addAttribute("show",1);
            if(o2!=null){
                if(Integer.valueOf(o2.toString())>2){
                    TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 2).eq("orderNum", item.get("orderNum")));
                    TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 2).eq("orderNum", tOrderPrivateCarId));
                    model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
                }
            }
@@ -254,7 +254,7 @@
            Object o2 = item.get("responsibilityType");
            if(o2!=null){
                if(Integer.valueOf(o2.toString())>2){
                    TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 3).eq("orderNum", item.get("orderNum")));
                    TAbnormalPayOrder tAbnormalPayOrder = tAbnormalPayOrderService.selectOne(new EntityWrapper<TAbnormalPayOrder>().eq("type", 3).eq("orderNum", tOrderPrivateCarId));
                    model.addAttribute("money",tAbnormalPayOrder.getPayMoney());
                }
            }
@@ -692,7 +692,7 @@
            tOrderPrivateCar.setResponsibilityType(responsibilityTypeVal);
            tOrderPrivateCar.setAbnormalStatus(2);
            if(responsibilityTypeVal>3){
                tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getPayMoney());
                tOrderPrivateCar.setResponsibilityMoney(tOrderPrivateCar.getOrderMoney());
                tOrderPrivateCar.setOrderMoney(new BigDecimal(money));
            }
            if(responsibilityTypeVal>2){
@@ -715,6 +715,7 @@

            if(responsibilityTypeVal<3){
                tOrderPrivateCar.setState(9);
                tOrderPrivateCar.setPayType(5);
            }
            tOrderPrivateCar.setAbnormalRemark(remark);
            tOrderPrivateCarService.updateById(tOrderPrivateCar);
@@ -796,7 +797,7 @@
            tOrderCrossCity.setResponsibilityType(responsibilityTypeVal);
            tOrderCrossCity.setAbnormalStatus(2);
            if(responsibilityTypeVal>3) {
                tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getPayMoney());
                tOrderCrossCity.setResponsibilityMoney(tOrderCrossCity.getOrderMoney());
                tOrderCrossCity.setOrderMoney(new BigDecimal(money));
            }
            if(responsibilityTypeVal>2){
@@ -830,7 +831,7 @@
            tOrderTaxi.setResponsibilityType(responsibilityTypeVal);
            tOrderTaxi.setAbnormalStatus(2);
            if(responsibilityTypeVal>3) {
                tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getPayMoney());
                tOrderTaxi.setResponsibilityMoney(tOrderTaxi.getOrderMoney());
                tOrderTaxi.setOrderMoney(new BigDecimal(money));
            }
            if(responsibilityTypeVal>2){