Merge remote-tracking branch 'origin/2.0' into 2.0

zhibing.pu

2024-08-27 d1cc28c9fd86017f4a0a9013554bf1602fef8bc8

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java

@@ -729,7 +729,7 @@
            WaterVO waterVO = new WaterVO();
            switch (orderCancel.getOrderType()){
                case 1:
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel);
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel.getOrderId());
                    if (tOrderPrivateCar == null){
                        continue;
                    }
@@ -740,14 +740,7 @@
                            continue;
                        }
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO.setPayType("银行卡支付");
                            break;
                    }
                    waterVO.setPayType("手机支付");
                    // 专车
                    waterVO.setCode(tOrderPrivateCar.getOrderNum());
                    String string = orderCancel.getMoney().toString();
@@ -798,7 +791,7 @@
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -819,7 +812,7 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -1349,14 +1342,7 @@
                            continue;
                        }
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO.setPayType("银行卡支付");
                            break;
                    }
                    waterVO.setPayType("手机支付");
                    // 专车
                    waterVO.setCode(tOrderPrivateCar.getOrderNum());
                    String string = orderCancel.getMoney().toString();
@@ -1407,7 +1393,7 @@
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -1428,7 +1414,7 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();