修改bug

Pu Zhibing

2024-09-29 adf2ede692b76cf95d0cec80f4087e52d760b219

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

@@ -603,7 +603,7 @@
            switch (type){
                case 1:
                    // 只查询用户订单
                     tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
                    tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
                    tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
                    // 用户取消订单费用
                    orderCancelEntityWrapper.eq("state", 2)
@@ -674,9 +674,9 @@
            if (tOrderPrivateCar != null){
                waterVO.setCode(tOrderPrivateCar.getOrderNum());
                String string = tOrderPrivateCar.getPayMoney().toString();
                waterVO.setMoney(new BigDecimal(string));
                waterVO.setMoney(new BigDecimal(string)+"");
            }else{
                waterVO.setMoney(new BigDecimal("0"));
                waterVO.setMoney(new BigDecimal("0")+"");
            }
            TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
            if (user1!=null){
@@ -702,8 +702,8 @@
            // 小件物流
            waterVO.setCode(tOrderLogistic.getOrderNum());
            String string = tOrderLogistic.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string));
            waterVO.setMoney(new BigDecimal("0"));
            waterVO.setMoney(new BigDecimal(string)+"");
            waterVO.setMoney(new BigDecimal("0")+"");
            TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
            if (user2!=null){
                waterVO.setName(user2.getNickName());
@@ -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,18 +740,21 @@
                            continue;
                        }
                    }
                    switch (tOrderPrivateCar.getPayType()){
                    switch (orderCancel.getPayType()){
                        case 1:
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            waterVO.setPayType("余额支付");
                            break;
                    }
                    // 专车
                    waterVO.setCode(tOrderPrivateCar.getOrderNum());
                    String string = orderCancel.getMoney().toString();
                    waterVO.setMoney(new BigDecimal(string));
                    waterVO.setMoney(new BigDecimal(string)+"");
                    TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user1!=null){
                        waterVO.setName(user1.getNickName());
@@ -761,7 +764,7 @@
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    break;
                case 2:
                case 4:
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
                    if (payType!=null){
                        if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
@@ -774,19 +777,22 @@
                    // 小件物流
                    waterVO1.setCode(tOrderLogistics1.getOrderNum());
                    String string1 = orderCancel.getMoney().toString();
                    waterVO1.setMoney(new BigDecimal(string1));
                    waterVO1.setMoney(new BigDecimal(string1)+"");
                    TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId());
                    if (user2!=null){
                        waterVO1.setName(user2.getNickName());
                        waterVO1.setPhone(user2.getPhone());
                    }
                    waterVO1.setType("用户订单消费");
                    switch (tOrderLogistics1.getPayType()){
                    switch (orderCancel.getPayType()){
                        case 1:
                            waterVO1.setPayType("手机支付");
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO1.setPayType("银行卡支付");
                            waterVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            waterVO.setPayType("余额支付");
                            break;
                    }
                    waterVO1.setRemark(tOrderLogistics1.getRemark());
@@ -798,7 +804,7 @@
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -810,8 +816,8 @@
                waterVO.setPhone(tDriver.getPhone());
            }

            waterVO.setMoney(tPubWithdrawal.getMoney());
            waterVO.setPayType("银行卡支付");
            waterVO.setMoney("-"+tPubWithdrawal.getMoney());
            waterVO.setPayType("手机支付");
            waterVO.setType("司机提现");
            waterVO.setRemark(tPubWithdrawal.getRemark());
            res.add(waterVO);
@@ -819,7 +825,7 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -832,8 +838,8 @@
                waterVO.setName(user2.getNickName());
                waterVO.setPhone(user2.getPhone());
            }
            waterVO.setMoney(tPubWithdrawal.getMoney());
            waterVO.setPayType("银行卡支付");
            waterVO.setMoney("-"+tPubWithdrawal.getMoney());
            waterVO.setPayType("手机支付");
            waterVO.setType("用户提现");
            waterVO.setRemark(tPubWithdrawal.getRemark());
            res.add(waterVO);
@@ -872,7 +878,7 @@
                    }
                }

                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
            }else{
                continue;
            }
@@ -945,7 +951,7 @@
                    if (income.getOrderMoney() != null){
                        String string = income.getPrice().toString();
                        BigDecimal bigDecimal1 = new BigDecimal(string);
                        platformVO.setMoney(bigDecimal1);
                        platformVO.setMoney(bigDecimal1+"");
                    }else{
                        continue;
                    }
@@ -1003,7 +1009,7 @@
                        platformVO.setPhone(tDriver1.getPhone());
                    }
                    platformVO.setRemark(tOrderLogistics1.getRemark());
                    platformVO.setMoney(new BigDecimal(income.getPrice()));
                    platformVO.setMoney(new BigDecimal(income.getPrice())+"");
                    if (income.getCreateTime()!=null){
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }
@@ -1286,7 +1292,7 @@
            // 专车
                waterVO.setCode(tOrderPrivateCar.getOrderNum());
                String string = tOrderPrivateCar.getPayMoney().toString();
                waterVO.setMoney(new BigDecimal(string));
                waterVO.setMoney(new BigDecimal(string)+"");
            TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
            if (user1!=null){
                waterVO.setName(user1.getNickName());
@@ -1311,8 +1317,8 @@
            // 小件物流
            waterVO.setCode(tOrderLogistic.getOrderNum());
            String string = tOrderLogistic.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string));
            waterVO.setMoney(new BigDecimal("0"));
            waterVO.setMoney(new BigDecimal(string)+"");
            waterVO.setMoney(new BigDecimal("0")+"");
            TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
            if (user2!=null){
                waterVO.setName(user2.getNickName());
@@ -1338,7 +1344,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;
                    }
@@ -1349,18 +1355,21 @@
                            continue;
                        }
                    }
                    switch (tOrderPrivateCar.getPayType()){
                    switch (orderCancel.getPayType()){
                        case 1:
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            waterVO.setPayType("余额支付");
                            break;
                    }
                    // 专车
                    waterVO.setCode(tOrderPrivateCar.getOrderNum());
                    String string = orderCancel.getMoney().toString();
                    waterVO.setMoney(new BigDecimal(string));
                    waterVO.setMoney(new BigDecimal(string)+"");
                    TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user1!=null){
                        waterVO.setName(user1.getNickName());
@@ -1370,7 +1379,7 @@
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    break;
                case 2:
                case 4:
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
                    if (payType!=null){
                        if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
@@ -1383,19 +1392,22 @@
                    // 小件物流
                    waterVO1.setCode(tOrderLogistics1.getOrderNum());
                    String string1 = orderCancel.getMoney().toString();
                    waterVO1.setMoney(new BigDecimal(string1));
                    waterVO1.setMoney(new BigDecimal(string1)+"");
                    TUser user2 = appUserService.selectById(tOrderLogistics1.getUserId());
                    if (user2!=null){
                        waterVO1.setName(user2.getNickName());
                        waterVO1.setPhone(user2.getPhone());
                    }
                    waterVO1.setType("用户订单消费");
                    switch (tOrderLogistics1.getPayType()){
                    switch (orderCancel.getPayType()){
                        case 1:
                            waterVO1.setPayType("手机支付");
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO1.setPayType("银行卡支付");
                            waterVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            waterVO.setPayType("余额支付");
                            break;
                    }
                    waterVO1.setRemark(tOrderLogistics1.getRemark());
@@ -1407,7 +1419,7 @@
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -1419,8 +1431,8 @@
                waterVO.setPhone(tDriver.getPhone());
            }

            waterVO.setMoney(tPubWithdrawal.getMoney());
            waterVO.setPayType("银行卡支付");
            waterVO.setMoney("-"+tPubWithdrawal.getMoney());
            waterVO.setPayType("手机支付");
            waterVO.setType("司机提现");
            waterVO.setRemark(tPubWithdrawal.getRemark());
            res.add(waterVO);
@@ -1428,7 +1440,7 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -1439,8 +1451,8 @@
                waterVO.setName(user2.getNickName());
                waterVO.setPhone(user2.getPhone());
            }
            waterVO.setMoney(tPubWithdrawal.getMoney());
            waterVO.setPayType("银行卡支付");
            waterVO.setMoney("-"+tPubWithdrawal.getMoney());
            waterVO.setPayType("手机支付");
            waterVO.setType("用户提现");
            waterVO.setRemark(tPubWithdrawal.getRemark());
            res.add(waterVO);
@@ -1483,7 +1495,7 @@
                    }
                }

                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
            }else{
                continue;
            }
@@ -1554,7 +1566,7 @@
                    if (income.getPrice() != null){
                        String string = income.getPrice().toString();
                        BigDecimal bigDecimal1 = new BigDecimal(string);
                        platformVO.setMoney(bigDecimal1);
                        platformVO.setMoney(bigDecimal1+"");
                    }else{
                        continue;
                    }
@@ -1636,7 +1648,7 @@
                    }

                    platformVO.setRemark(tOrderLogistics1.getRemark());
                    platformVO.setMoney(BigDecimal.valueOf(income.getPrice()));
                    platformVO.setMoney(BigDecimal.valueOf(income.getPrice())+"");
                    if (income.getCreateTime()!=null){
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }