修改2.0 bug

Pu Zhibing

2024-10-11 fa0a4b0ac2c4eaf2d289983ae117488ad80511cb

 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)
@@ -671,13 +671,9 @@
                    break;
            }
            // 专车
            if (tOrderPrivateCar != null){
                waterVO.setCode(tOrderPrivateCar.getOrderNum());
                String string = tOrderPrivateCar.getPayMoney().toString();
                waterVO.setMoney(new BigDecimal(string));
            }else{
                waterVO.setMoney(new BigDecimal("0"));
            }
            waterVO.setCode(tOrderPrivateCar.getOrderNum());
            String string = tOrderPrivateCar.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string)+"");
            TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
            if (user1!=null){
                waterVO.setName(user1.getNickName());
@@ -688,7 +684,7 @@
                waterVO.setRemark(tOrderPrivateCar.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
            userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
        }
        for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
            if (payType!=null){
@@ -702,8 +698,7 @@
            // 小件物流
            waterVO.setCode(tOrderLogistic.getOrderNum());
            String string = tOrderLogistic.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string));
            waterVO.setMoney(new BigDecimal("0"));
            waterVO.setMoney(new BigDecimal(string)+"");
            TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
            if (user2!=null){
                waterVO.setName(user2.getNickName());
@@ -722,14 +717,14 @@
                waterVO.setRemark(tOrderLogistic.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
            userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
            break;
        }
        for (OrderCancel orderCancel : orderCancels) {
            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 +735,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());
@@ -759,9 +757,9 @@
                    }
                    waterVO.setRemark(tOrderPrivateCar.getRemark());
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
                    break;
                case 2:
                case 4:
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
                    if (payType!=null){
                        if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
@@ -774,31 +772,34 @@
                    // 小件物流
                    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("手机支付");
                            break;
                        case 2:
                            waterVO1.setPayType("银行卡支付");
                            break;
                        case 3:
                            waterVO1.setPayType("余额支付");
                            break;
                    }
                    waterVO1.setRemark(tOrderLogistics1.getRemark());

                    res.add(waterVO1);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    userConsume = userConsume.add(new BigDecimal(waterVO1.getMoney()));
                    break;
            }
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -810,8 +811,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 +820,7 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
@@ -832,8 +833,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 +873,7 @@
                    }
                }

                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
            }else{
                continue;
            }
@@ -945,7 +946,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 +1004,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()));
                    }
@@ -1048,7 +1049,7 @@
    private IOrderCancelService orderCancelService;
    @RequestMapping(value = "/water/list")
    @ResponseBody
    public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
    public Object list1(Integer time,String insertTime,Integer payType,Integer type, String code) {
        if (payType!=null){
            switch (payType){
                case 1:
@@ -1242,6 +1243,13 @@
                    break;
            }
        }else{
            if(ToolUtil.isNotEmpty(code)){
                tOrderPrivateCarEntityWrapper.like("orderNum", code);
                tOrderLogisticsEntityWrapper.like("orderNum", code);
                orderType.like("", code);
            }
            
            
            // 只查询用户订单
            tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
            tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
@@ -1266,12 +1274,14 @@
        BigDecimal userWithdrawal = new BigDecimal("0");
        // 用户订单消费

        // 用户订单消费
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
            if (payType!=null){
                if (tOrderPrivateCar.getPayType()!=payType){
                    continue;
                }
            }

            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
            waterVO.setType("用户订单消费");
@@ -1284,9 +1294,9 @@
                    break;
            }
            // 专车
                waterVO.setCode(tOrderPrivateCar.getOrderNum());
                String string = tOrderPrivateCar.getPayMoney().toString();
                waterVO.setMoney(new BigDecimal(string));
            waterVO.setCode(tOrderPrivateCar.getOrderNum());
            String string = tOrderPrivateCar.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string)+"");
            TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
            if (user1!=null){
                waterVO.setName(user1.getNickName());
@@ -1297,7 +1307,7 @@
                waterVO.setRemark(tOrderPrivateCar.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderPrivateCar.getPayMoney().toString()));
            userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
        }
        for (TOrderLogistics tOrderLogistic : tOrderLogistics) {
            if (payType!=null){
@@ -1311,8 +1321,7 @@
            // 小件物流
            waterVO.setCode(tOrderLogistic.getOrderNum());
            String string = tOrderLogistic.getPayMoney().toString();
            waterVO.setMoney(new BigDecimal(string));
            waterVO.setMoney(new BigDecimal("0"));
            waterVO.setMoney(new BigDecimal(string)+"");
            TUser user2 = appUserService.selectById(tOrderLogistic.getUserId());
            if (user2!=null){
                waterVO.setName(user2.getNickName());
@@ -1331,14 +1340,14 @@
                waterVO.setRemark(tOrderLogistic.getRemark());
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
            userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
            break;
        }
        for (OrderCancel orderCancel : orderCancels) {
            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 +1358,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());
@@ -1368,9 +1380,9 @@
                    }
                    waterVO.setRemark(tOrderPrivateCar.getRemark());
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
                    break;
                case 2:
                case 4:
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
                    if (payType!=null){
                        if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
@@ -1383,32 +1395,39 @@
                    // 小件物流
                    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("手机支付");
                            break;
                        case 2:
                            waterVO1.setPayType("银行卡支付");
                            break;
                        case 3:
                            waterVO1.setPayType("余额支付");
                            break;
                    }
                    waterVO1.setRemark(tOrderLogistics1.getRemark());

                    res.add(waterVO1);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    userConsume = userConsume.add(new BigDecimal(waterVO1.getMoney()));
                    break;
            }
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            String code1 = tPubWithdrawal.getCode();
            if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
                continue;
            }
            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
@@ -1419,8 +1438,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,8 +1447,12 @@
        }
        // 用户提现
        for (TPubWithdrawal tPubWithdrawal : user) {
            if(payType!=null && payType == 1){
            if(payType!=null && payType == 2){
                break;
            }
            String code1 = tPubWithdrawal.getCode();
            if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
                continue;
            }
            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
@@ -1439,8 +1462,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);
@@ -1454,6 +1477,10 @@
            if (paymentRecord!=null){
                if (paymentRecord.getState() == 1){
                    // 临时数据
                    continue;
                }
                String code1 = paymentRecord.getCode();
                if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
                    continue;
                }
                waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
@@ -1483,7 +1510,7 @@
                    }
                }

                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString()));
                waterVO.setMoney(new BigDecimal(paymentRecord.getAmount().toString())+"");
            }else{
                continue;
            }
@@ -1540,6 +1567,10 @@
                    if (tOrderPrivateCar==null){
                        continue;
                    }
                    String code1 = tOrderPrivateCar.getOrderNum();
                    if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
                        continue;
                    }
                    platformVO.setCode(tOrderPrivateCar.getOrderNum());
                    TDriver tDriver = driverService.selectById(tOrderPrivateCar.getDriverId());
                    if (tDriver != null){
@@ -1554,7 +1585,7 @@
                    if (income.getPrice() != null){
                        String string = income.getPrice().toString();
                        BigDecimal bigDecimal1 = new BigDecimal(string);
                        platformVO.setMoney(bigDecimal1);
                        platformVO.setMoney(bigDecimal1+"");
                    }else{
                        continue;
                    }
@@ -1628,6 +1659,10 @@
                        case 4:
                            continue;
                    }
                    String code2 = tOrderLogistics1.getOrderNum();
                    if(ToolUtil.isNotEmpty(code) && !code2.contains(code)){
                        continue;
                    }
                    platformVO.setCode(tOrderLogistics1.getOrderNum());
                    TDriver tDriver1 = driverService.selectById(tOrderLogistics1.getDriverId());
                    if (tDriver1!=null){
@@ -1636,7 +1671,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()));
                    }