Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

Pu Zhibing

2024-10-11 44e87d7d9ba5850eb50f837903a0966b518335be

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

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

@@ -435,7 +435,7 @@
     */
    @RequestMapping(value = "/water/getCount")
    @ResponseBody
    public Object getCount1(Integer time,String insertTime,Integer payType,Integer type) {
    public Object getCount1(Integer time,String insertTime,Integer payType,Integer type,String code) {
        if (payType!=null){
            switch (payType){
                case 1:
@@ -507,6 +507,8 @@
        // 用户小件物流订单记录
        List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
        List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
        // 用户取消订单记录
        List<OrderCancel> orderCancels = new ArrayList<>();
        // 用户充值
        List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
        // 司机结算总额
@@ -525,12 +527,10 @@
        EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
        // 用户小件物流订单wrapper
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        // 用户取消订单wrapper
        Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
        // 用户取消订单记录
        List<OrderCancel> orderCancels = new ArrayList<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        List<Integer> integers = new ArrayList<>();
        integers.add(1);
        integers.add(2);
@@ -559,11 +559,12 @@
                    .in("payType",Arrays.asList(1, 2));
            // 司机手动结算金额
            orderType1 = new EntityWrapper<SettlementDetail>()
                    .isNotNull("settlementRecordId")
                    .in("orderType", Arrays.asList(1, 4));
            // 用户取消订单费用
            orderCancelEntityWrapper.eq("state", 2)
                    .eq("userType", 1).in("payType",integers)
                    ;
                    .in("payType",integers)
                    .eq("userType", 1);
        }else{
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("orderType", 5)
@@ -581,6 +582,7 @@
                    .between("handleTime", start, end);
            // 司机手动结算金额
           orderType1 = new EntityWrapper<SettlementDetail>()
                    .isNotNull("settlementRecordId")
                    .in("orderType", Arrays.asList(1, 4))
                    .between("createTime", start, end);
            // 用户专车订单wrapper
@@ -599,15 +601,15 @@
                    .in("payType",integers)
                    .between("insertTime", start, end);
        }


        if (type != null){
            switch (type){
                case 1:
                    // 只查询用户订单
                    tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
                    tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
                    // 用户取消订单费用
                    orderCancelEntityWrapper.eq("state", 2)
                            .eq("userType", 1);
                    orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
                    break;
                case 2:
                    // 只查询用户充值
@@ -627,16 +629,23 @@
                    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);
            orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);

            tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
            // 只查询司机手动结算的
            settlementDetails1 = settlementDetailService.selectList(orderType1);
            driver = pubWithdrawalService.selectList(between);
            user = pubWithdrawalService.selectList(userWrapper);
            orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);

        }
        List<WaterVO> res = new ArrayList<>();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -650,6 +659,7 @@
        BigDecimal driverWithdrawal = new BigDecimal("0");
        // 用户提现金额
        BigDecimal userWithdrawal = new BigDecimal("0");
        // 用户订单消费

        // 用户订单消费
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
@@ -802,6 +812,10 @@
            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()));
            waterVO.setCode(tPubWithdrawal.getCode());
@@ -823,10 +837,12 @@
            if(payType!=null && payType == 2){
                break;
            }
            WaterVO waterVO = new WaterVO();
            if (tPubWithdrawal.getHandleTime()!=null){
                waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
            String code1 = tPubWithdrawal.getCode();
            if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
                continue;
            }
            WaterVO waterVO = new WaterVO();
            waterVO.setInsertTime(format.format(tPubWithdrawal.getHandleTime()));
            waterVO.setCode(tPubWithdrawal.getCode());
            TUser user2 = appUserService.selectById(tPubWithdrawal.getUserId());
            if (user2!=null){
@@ -850,6 +866,10 @@
                    // 临时数据
                    continue;
                }
                String code1 = paymentRecord.getCode();
                if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
                    continue;
                }
                waterVO.setInsertTime(format.format(paymentRecord.getInsertTime()));
                waterVO.setCode(paymentRecord.getCode());
                if (paymentRecord.getPayType()!=null){
@@ -868,8 +888,12 @@
                                    continue;
                                }
                            }

                            waterVO.setPayType("银行卡支付");
                            break;
                        case 3:
                        case 4:
                            continue;
                    }
                }

@@ -897,8 +921,8 @@
            switch (income.getOrderType()){
                case 1:
                    SettlementRecord settlementRecord = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord!=null){
                        if (settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
                    if (settlementRecord!=null && settlementRecord.getPaymentStatus()!=null && settlementRecord.getPaymentStatus() == 2){
                        if (settlementRecord.getPayType()!=null){
                            switch (settlementRecord.getPayType()){
                                case 1:
                                    if (payType!=null){
@@ -921,8 +945,6 @@
                                    continue;
                            }

                        }else{
                            continue;
                        }
                    }else{
                        continue;
@@ -930,6 +952,10 @@
                    // 查询订单信息
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(income.getOrderId());
                    if (tOrderPrivateCar==null){
                        continue;
                    }
                    String code1 = tOrderPrivateCar.getOrderNum();
                    if(ToolUtil.isNotEmpty(code) && !code1.contains(code)){
                        continue;
                    }
                    platformVO.setCode(tOrderPrivateCar.getOrderNum());
@@ -943,7 +969,7 @@
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }
                    platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    if (income.getOrderMoney() != null){
                    if (income.getPrice() != null){
                        String string = income.getPrice().toString();
                        BigDecimal bigDecimal1 = new BigDecimal(string);
                        platformVO.setMoney(bigDecimal1+"");
@@ -955,16 +981,17 @@
                        continue;
                    }


                    // 专车订单
                    String string4 = income.getPrice().toString();
                    String string4 = tOrderPrivateCar.getOrderMoney().toString();
                    balance = balance.add(new BigDecimal(string4));
                    res.add(platformVO);
                    break;
                case 4:
                    // 小件物流
                    // 查询订单信息
                    SettlementRecord settlementRecord1 = settlementRecordService.selectById(income.getSettlementRecordId());
                    if (settlementRecord1!=null&& settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
                        if (settlementRecord1.getPayType()!=null){
                    if (settlementRecord1!=null){
                        if (settlementRecord1.getPaymentStatus()!=null && settlementRecord1.getPaymentStatus() == 2){
                            switch (settlementRecord1.getPayType()){
                                case 1:
                                    if (payType!=null){
@@ -987,14 +1014,40 @@
                                    continue;
                            }

                        }else{
                            continue;
                        }
                    }else {
                        continue;
                    }
                    // 小件物流
                    // 查询订单信息
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(income.getOrderId());
                    if (tOrderLogistics1==null){
                        continue;
                    }
                    switch (tOrderLogistics1.getPayType()){
                        case 1:
                            if (payType!=null){
                                if (payType != 1){
                                    continue;
                                }
                            }
                            platformVO.setPayType("手机支付");
                            break;
                        case 2:
                            if (payType!=null){
                                if (payType != 2){
                                    continue;
                                }
                            }
                            platformVO.setPayType("银行卡支付");
                            break;
                        case 3:

                        case 4:
                            continue;
                    }
                    String code2 = tOrderLogistics1.getOrderNum();
                    if(ToolUtil.isNotEmpty(code) && !code2.contains(code)){
                        continue;
                    }
                    platformVO.setCode(tOrderLogistics1.getOrderNum());
@@ -1003,8 +1056,9 @@
                        platformVO.setName(tDriver1.getFirstName()+tDriver1.getLastName());
                        platformVO.setPhone(tDriver1.getPhone());
                    }

                    platformVO.setRemark(tOrderLogistics1.getRemark());
                    platformVO.setMoney(new BigDecimal(income.getPrice())+"");
                    platformVO.setMoney(BigDecimal.valueOf(income.getPrice())+"");
                    if (income.getCreateTime()!=null){
                        platformVO.setInsertTime(format.format(income.getCreateTime()));
                    }
@@ -1013,7 +1067,7 @@
                        continue;
                    }

                    String string1 = income.getPrice().toString();
                    String string1 = tOrderLogistics1.getOrderMoney().toString();
                    // 小件物流订单
                    balance = balance.add(new BigDecimal(string1));
                    res.add(platformVO);
@@ -1253,12 +1307,13 @@
            // 只查询用户订单
            tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
            tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);
            orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);

            tPubTransactionDetails = pubTransactionDetailsService.selectList(orderType);
            // 只查询司机手动结算的
            settlementDetails1 = settlementDetailService.selectList(orderType1);
            driver = pubWithdrawalService.selectList(between);
            user = pubWithdrawalService.selectList(userWrapper);
            orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
        }
        List<WaterVO> res = new ArrayList<>();
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

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

@@ -232,6 +232,7 @@
                    .isNotNull("redPacketMoney");
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .eq("type",1)
                    .ne("purpose", 6);
            // 司机提现
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
@@ -276,6 +277,7 @@
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6)
                    .eq("type",1)
                    .between("createTime", start, end);


@@ -579,6 +581,7 @@
        List<BalanceUsageRecord> balanceUsageRecords = new ArrayList<>();
        // 司机提现
        List<TPubWithdrawal> driverWithdrawal = new ArrayList<>();

        Wrapper<TPubWithdrawal> driverWrapper = new EntityWrapper<TPubWithdrawal>()
                ;
        // 专车wrapper
@@ -600,14 +603,7 @@
        // 司机已消费金额
        Wrapper<BalanceUsageRecord> between4 = new EntityWrapper<BalanceUsageRecord>()
                ;
        // 司机提现
        Wrapper<BalanceUsageRecord> between44 = new EntityWrapper<BalanceUsageRecord>()
                ;
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2);
            // 专车wrapper
            between = new EntityWrapper<TOrderPrivateCar>()
                    .isNotNull("activityId")
@@ -632,8 +628,14 @@
                    .isNotNull("redPacketMoney");
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .eq("type",1)
                    .ne("purpose", 6);

            // 司机提现
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
                    .eq("type",1)
                    .eq("userType", 2)
            ;
        }else{
            driverWrapper = new EntityWrapper<TPubWithdrawal>()
                    .eq("state", 2)
@@ -671,9 +673,12 @@
            // 司机已消费金额
            between4 = new EntityWrapper<BalanceUsageRecord>()
                    .ne("purpose", 6)
                    .eq("type",1)
                    .between("createTime", start, end);
        }


        }
        // 司机提现wrapper
        if (type!=null){
            switch (type){
                case 1:
@@ -689,8 +694,6 @@
                case 3:
                    // 司机消费记录
                    balanceUsageRecords = balanceUsageRecordService.selectList(between4);

                    // 司机提现记录
                    driverWithdrawal = pubWithdrawalService.selectList(driverWrapper);
                    break;
                case 4:
@@ -733,9 +736,6 @@
        BigDecimal driverWithdrawal1 = new BigDecimal("0");
        // 查询已使用折扣总额
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
            if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
                continue;
            }
            discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -749,9 +749,6 @@
            res.add(grantVO);
        }
        for (TOrderLogistics tOrderPrivateCar : tOrderLogistics) {
            if (tOrderPrivateCar.getState() != 9 &&tOrderPrivateCar.getState() != 8){
                continue;
            }
            discount = discount.add(new BigDecimal(tOrderPrivateCar.getDiscountMoney().toString()));
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
@@ -764,15 +761,12 @@
            grantVO.setRemark("订单号："+tOrderPrivateCar.getOrderNum());
            res.add(grantVO);
        }
        // 查询已领取红包总额
        // 查询已使用红包总额
        for (TOrderPrivateCar userRedPacketRecord : userRedPacketRecords) {
            if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
            JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
//            JSONArray objects = JSONArray.parseArray(userRedPacketRecord.getRedPacketId());
//            BigDecimal temp = new BigDecimal(BigInteger.ZERO);
//            for (int i = 0; i < objects.size(); i++) {
//                String string = objects.getJSONObject(i).getString("money");
@@ -791,12 +785,9 @@
            }
            grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
            res.add(grantVO);
            redPackage = redPackage.add(userRedPacketRecord.getRedPacketMoney());
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
        }
        for (TOrderLogistics userRedPacketRecord : userRedPacketRecords1) {
            if (userRedPacketRecord.getState() != 9 &&userRedPacketRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userRedPacketRecord.getInsertTime()));
            grantVO.setType("红包");
@@ -813,13 +804,10 @@
            }
            grantVO.setRemark("订单号："+userRedPacketRecord.getOrderNum());
            res.add(grantVO);
            redPackage = redPackage.add(new BigDecimal(temp.toString()));
            redPackage = redPackage.add(new BigDecimal(userRedPacketRecord.getPayMoney().toString()));
        }
        // 查询已领取优惠券总额
        for (TOrderPrivateCar userCouponRecord : userCouponRecords) {
            if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
            grantVO.setType("优惠券");
@@ -829,13 +817,10 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
            coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
            coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
            res.add(grantVO);
        }
        for (TOrderLogistics userCouponRecord : userCouponRecords1) {
            if (userCouponRecord.getState() != 9 &&userCouponRecord.getState() != 8){
                continue;
            }
            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(userCouponRecord.getInsertTime()));
            grantVO.setType("优惠券");
@@ -845,12 +830,11 @@
                grantVO.setName(tUser.getNickName());
            }
            grantVO.setRemark("订单号："+userCouponRecord.getOrderNum());
            coupon = coupon.add(new BigDecimal(userCouponRecord.getCouponMoney().toString()));
            coupon = coupon.add(new BigDecimal(userCouponRecord.getPayMoney().toString()));
            res.add(grantVO);
        }
        // 司机消费奖励
        for (BalanceUsageRecord balanceUsageRecord : balanceUsageRecords) {

            GrantVO grantVO = new GrantVO();
            grantVO.setInsertTime(format.format(balanceUsageRecord.getCreateTime()));
            grantVO.setType("司机奖励");

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

@@ -194,6 +194,7 @@
    ajax.set("time",1);
    ajax.set("insertTime",null);
    ajax.set("state",null);
    ajax.set("code",null);
    ajax.start();
}
// 点击搜索
@@ -214,6 +215,7 @@
    ajax.set("insertTime",$("#insertTime").val());
    ajax.set("type",$("#type").val());
    ajax.set("payType",$("#payType").val());
    ajax.set("code",$("#code").val());
    ajax.start();
}
/**