2.0bug修改

无关风月

2024-10-22 2b18b65181d9f30c5e0485cf2bbbdfee41b24b8e

2.0bug修改

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

@@ -177,6 +177,7 @@
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .ne("type", 1)
                    .between("insertTime", start, end)
                    .isNotNull("orderType"));
        }else{
            if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -184,6 +185,7 @@
                        .eq("userType", 1)
                        .eq("objectId",1)
                        .ne("type", 1)
                        .between("insertTime", start, end)
                        .isNotNull("orderType"));
            }else{
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
@@ -191,6 +193,7 @@
                        .eq("objectId",1)
                        .ne("type", 1)
                        .isNotNull("orderType")

                        .between("insertTime", start, end));
            }

@@ -236,22 +239,44 @@
                    String string = income.getMoney().toString();
                    BigDecimal bigDecimal1 = new BigDecimal(string);
                    platformVO.setMoney(bigDecimal1);
                    if (tOrderPrivateCar.getPayType() == null){
                    if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
                        continue;
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            platformVO.setPayType("余额支付");
                            break;
                        case 4:
                            platformVO.setPayType("现金支付");
                            break;
                    if (tOrderPrivateCar.getState() == 10){
                        // 查询取消订单 用户支付方式
                        OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
                                .eq("orderType", 4)
                                .eq("orderId", tOrderPrivateCar.getId()));
                        if (orderCancel!=null &&orderCancel.getPayType()!=null){
                            switch (orderCancel.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                            }
                        }
                    }else{
                        if (tOrderPrivateCar.getPayType()!=null){
                            switch (tOrderPrivateCar.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                                case 4:
                                    platformVO.setPayType("现金支付");
                                    break;
                            }
                        }
                    }

                    // 专车订单
@@ -281,22 +306,44 @@
                        platformVO.setEndTime(format.format(income.getInsertTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    if (tOrderLogistics.getPayType() == null){
                    if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
                        continue;
                    }
                    switch (tOrderLogistics.getPayType()){
                        case 1:
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            platformVO.setPayType("余额支付");
                            break;
                        case 4:
                            platformVO.setPayType("现金支付");
                            break;
                    if (tOrderLogistics.getState() == 10){
                        // 查询取消订单 用户支付方式
                        OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
                                .eq("orderType", 4)
                                .eq("orderId", tOrderLogistics.getId()));
                        if (orderCancel!=null &&orderCancel.getPayType()!=null){
                            switch (orderCancel.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                            }
                        }
                    }else{
                        if (tOrderLogistics.getPayType()!=null){
                            switch (tOrderLogistics.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                                case 4:
                                    platformVO.setPayType("现金支付");
                                    break;
                            }
                        }
                    }

                    // 专车订单
@@ -307,11 +354,11 @@
        }

        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        if (time == 5 && !StringUtils.hasLength(insertTime)){

        }else{
            settlementDetailEntityWrapper.between("createTime", start, end);
        if (state!=null && state == 2){
            settlementDetailEntityWrapper.eq("paymentStatus", 2);
        }
        settlementDetailEntityWrapper.between("createTime", start, end);

        settlementDetails = settlementDetailService.selectList(settlementDetailEntityWrapper);
        // 查询所有现金支付的订单 再根据结算主表判断是否已结算
        for (SettlementDetail settlementDetail : settlementDetails) {
@@ -728,7 +775,6 @@
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
            break;
        }
        for (OrderCancel orderCancel : orderCancels) {
            WaterVO waterVO = new WaterVO();
@@ -1207,32 +1253,37 @@
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("userType",1)
                    .eq("orderType", 5)
                    .between("insertTime",start,end)
            ;
            // 用户提现wrapper
            userWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 1)
                    .between("insertTime",start,end)
            ;
            // 司机提现wrapper
            between = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("userType", 2);
                    .eq("userType", 2).between("insertTime",start,end);
            // 用户专车订单wrapper
            tOrderPrivateCarEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2));
                    .in("payType",Arrays.asList(1, 2)).between("insertTime",start,end);
            // 用户小件物流订单wrapper
            tOrderLogisticsEntityWrapper
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2));
                    .in("payType",Arrays.asList(1, 2)).between("insertTime",start,end);
            // 司机手动结算金额
            orderType1 = new EntityWrapper<SettlementDetail>()
                    .isNotNull("settlementRecordId")
                    .in("orderType", Arrays.asList(1, 4));
                    .in("orderType", Arrays.asList(1, 4)).between("insertTime",start,end);
            // 用户取消订单费用
             orderCancelEntityWrapper.eq("state", 2)

                     .in("payType",integers)
                    .eq("userType", 1);

                    .eq("userType", 1)
                     .between("insertTime",start,end);
        }else{
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("orderType", 5)
@@ -1396,7 +1447,6 @@
            }
            res.add(waterVO);
            userConsume = userConsume.add(new BigDecimal(waterVO.getMoney()));
            break;
        }
        for (OrderCancel orderCancel : orderCancels) {
            WaterVO waterVO = new WaterVO();
@@ -1821,6 +1871,8 @@
                    .eq("userType", 1)
                    .eq("objectId",1)
                    .ne("type", 1)
                    .between("insertTime", start, end)

                    .isNotNull("orderType"));
        }else{

@@ -1829,6 +1881,8 @@
                        .eq("userType", 1)
                        .eq("objectId",1)
                        .ne("type", 1)
                        .between("insertTime", start, end)

                        .isNotNull("orderType"));
            }else{
                incomes = tIncomeService.selectList(new EntityWrapper<Income>()
@@ -1840,6 +1894,10 @@
            }
        }
        EntityWrapper<SettlementDetail> settlementDetailEntityWrapper = new EntityWrapper<>();
        settlementDetailEntityWrapper.between("createTime", start, end);
        if (state!=null && state == 2){
            settlementDetailEntityWrapper.eq("paymentStatus", 2);
        }
        if (time == 5 && !StringUtils.hasLength(insertTime)){

        }else{
@@ -1879,23 +1937,47 @@
                    }
                    platformVO.setMoney(new BigDecimal(income.getMoney()));
                    platformVO.setInsertTime(format.format(income.getInsertTime()));
                    if (tOrderPrivateCar.getPayType() == null){
                    if (tOrderPrivateCar.getState()!=10 && tOrderPrivateCar.getPayType() == null){
                        continue;
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            platformVO.setPayType("余额支付");
                            break;
                        case 4:
                            platformVO.setPayType("现金支付");
                            break;
                    if (tOrderPrivateCar.getState() == 10){
                        // 查询取消订单 用户支付方式
                        OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
                                .eq("orderType", 1)
                                .eq("orderId", tOrderPrivateCar.getId()));
                        if (orderCancel!=null &&orderCancel.getPayType()!=null){
                            switch (orderCancel.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                            }
                        }
                    }else{
                        if (tOrderPrivateCar.getPayType()!=null){
                            switch (tOrderPrivateCar.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                                case 4:
                                    platformVO.setPayType("现金支付");
                                    break;
                            }
                        }
                    }



                    // 专车订单
                    balance = balance.add(new BigDecimal(income.getMoney()));
@@ -1923,22 +2005,44 @@
                        platformVO.setEndTime(format.format(income.getInsertTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderLogistics.getInsertTime()));
                    if (tOrderLogistics.getPayType() == null){
                    if (tOrderLogistics.getState()!=10 && tOrderLogistics.getPayType() == null){
                        continue;
                    }
                    switch (tOrderLogistics.getPayType()){
                        case 1:
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:
                            platformVO.setPayType("余额支付");
                            break;
                        case 4:
                            platformVO.setPayType("现金支付");
                            break;
                    if (tOrderLogistics.getState() == 10){
                        // 查询取消订单 用户支付方式
                        OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>()
                                .eq("orderType", 4)
                                .eq("orderId", tOrderLogistics.getId()));
                        if (orderCancel!=null &&orderCancel.getPayType()!=null){
                            switch (orderCancel.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                            }
                        }
                    }else{
                        if (tOrderLogistics.getPayType()!=null){
                            switch (tOrderLogistics.getPayType()){
                                case 1:
                                    platformVO.setPayType("手机支付");
                                    break;
                                case 2:
                                    platformVO.setPayType("银行卡支付");
                                    break;
                                case 3:
                                    platformVO.setPayType("余额支付");
                                    break;
                                case 4:
                                    platformVO.setPayType("现金支付");
                                    break;
                            }
                        }
                    }

                    // 专车订单

 ManagementIGOTravel/guns-admin/src/main/webapp/static/modular/system/tPubWithdrawal/tPubWithdrawal.js

@@ -76,6 +76,8 @@
                    } else if (row.type == 2){
                        btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="业务收入提现" onfocus="TUser.tooltip()">业务收入提现</p>']
                    }
                }else{
                    btn = ['<p class="toolTip" style="overflow:hidden;white-space:nowrap;text-overflow:ellipsis;" title="钱包余额提现" onfocus="TUser.tooltip()">钱包余额提现</p>']
                }
                return btn;
            }