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

zhibing.pu

2024-08-12 796dc4887bfc37eb29e5ac6c4737e51ff7ab4299

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

@@ -525,6 +525,10 @@
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        // 用户取消订单wrapper
        Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
        // 用户取消订单记录
        List<OrderCancel> orderCancels = new ArrayList<>();
        if (time == 5 && !StringUtils.hasLength(insertTime)){
            // 余额充值wrapper
            orderType = new EntityWrapper<TPubTransactionDetails>()
@@ -580,6 +584,10 @@
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2))
                    .between("insertTime", start, end);
            // 用户取消订单费用
            orderCancelEntityWrapper.eq("state", 2)
                    .eq("userType", 1)
                    .between("insertTime", start, end);
        }


@@ -589,7 +597,9 @@
                    // 只查询用户订单
                     tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
                    tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);

                    // 用户取消订单费用
                    orderCancelEntityWrapper.eq("state", 2)
                            .eq("userType", 1);
                    break;
                case 2:
                    // 只查询用户充值
@@ -617,6 +627,8 @@
            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");
@@ -630,6 +642,7 @@
        BigDecimal driverWithdrawal = new BigDecimal("0");
        // 用户提现金额
        BigDecimal userWithdrawal = new BigDecimal("0");

        // 用户订单消费
        for (TOrderPrivateCar tOrderPrivateCar : tOrderPrivateCars) {
            if (payType!=null){
@@ -704,7 +717,77 @@
            userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
            break;
        }
        for (OrderCancel orderCancel : orderCancels) {
            WaterVO waterVO = new WaterVO();
            switch (orderCancel.getOrderType()){
                case 1:
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel);
                    if (tOrderPrivateCar == null){
                        continue;
                    }
                    waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    waterVO.setType("用户订单消费");
                    if (payType!=null){
                        if (!Objects.equals(tOrderPrivateCar.getPayType(), payType)){
                            continue;
                        }
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO.setPayType("银行卡支付");
                            break;
                    }
                    // 专车
                    waterVO.setCode(tOrderPrivateCar.getOrderNum());
                    String string = orderCancel.getMoney().toString();
                    waterVO.setMoney(new BigDecimal(string));
                    TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user1!=null){
                        waterVO.setName(user1.getNickName());
                        waterVO.setPhone(user1.getPhone());
                    }
                    waterVO.setRemark(tOrderPrivateCar.getRemark());
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    break;
                case 2:
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
                    if (payType!=null){
                        if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
                            continue;
                        }
                    }
                    WaterVO waterVO1 = new WaterVO();
                    waterVO1.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
                    waterVO1.setType("用户订单消费");
                    // 小件物流
                    waterVO1.setCode(tOrderLogistics1.getOrderNum());
                    String string1 = orderCancel.getMoney().toString();
                    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()){
                        case 1:
                            waterVO1.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO1.setPayType("银行卡支付");
                            break;
                    }
                    waterVO1.setRemark(tOrderLogistics1.getRemark());

                    res.add(waterVO1);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    break;
            }
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){
@@ -953,6 +1036,8 @@
    private IPaymentRecordService paymentRecordService;
    @Autowired
    private ITUserService appUserService;
    @Autowired
    private IOrderCancelService orderCancelService;
    @RequestMapping(value = "/water/list")
    @ResponseBody
    public Object list1(Integer time,String insertTime,Integer payType,Integer type) {
@@ -1027,6 +1112,8 @@
        // 用户小件物流订单记录
        List<TOrderPrivateCar> tOrderPrivateCars = new ArrayList<>();
        List<TOrderLogistics> tOrderLogistics = new ArrayList<>();
        // 用户取消订单记录
        List<OrderCancel> orderCancels = new ArrayList<>();
        // 用户充值
        List<TPubTransactionDetails> tPubTransactionDetails = new ArrayList<>();
        // 司机结算总额
@@ -1045,6 +1132,8 @@
        EntityWrapper<TOrderPrivateCar> tOrderPrivateCarEntityWrapper = new EntityWrapper<>();
        // 用户小件物流订单wrapper
        EntityWrapper<TOrderLogistics> tOrderLogisticsEntityWrapper = new EntityWrapper<>();
        // 用户取消订单wrapper
        Wrapper<OrderCancel> orderCancelEntityWrapper = new EntityWrapper<>();
        // 司机手动结算金额
        Wrapper<SettlementDetail> orderType1 = new EntityWrapper<SettlementDetail>();
        if (time == 5 && !StringUtils.hasLength(insertTime)){
@@ -1074,6 +1163,9 @@
            orderType1 = new EntityWrapper<SettlementDetail>()
                    .isNotNull("settlementRecordId")
                    .in("orderType", Arrays.asList(1, 4));
            // 用户取消订单费用
             orderCancelEntityWrapper.eq("state", 2)
                    .eq("userType", 1);
        }else{
            orderType = new EntityWrapper<TPubTransactionDetails>()
                    .eq("orderType", 5)
@@ -1104,6 +1196,10 @@
                    .isNotNull("payMoney")
                    .in("payType",Arrays.asList(1, 2))
                    .between("insertTime", start, end);
            // 用户取消订单费用
            orderCancelEntityWrapper.eq("state", 2)
                    .eq("userType", 1)
                    .between("insertTime", start, end);
        }


@@ -1113,7 +1209,7 @@
                    // 只查询用户订单
                    tOrderPrivateCars = orderPrivateCarService.selectList(tOrderPrivateCarEntityWrapper);
                    tOrderLogistics = orderLogisticsService.selectList(tOrderLogisticsEntityWrapper);

                    orderCancels = orderCancelService.selectList(orderCancelEntityWrapper);
                    break;
                case 2:
                    // 只查询用户充值
@@ -1141,6 +1237,7 @@
            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");
@@ -1174,13 +1271,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"));
            }
            TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
            if (user1!=null){
                waterVO.setName(user1.getNickName());
@@ -1228,6 +1321,77 @@
            userConsume = userConsume.add(new BigDecimal(tOrderLogistic.getPayMoney().toString()));
            break;
        }
        for (OrderCancel orderCancel : orderCancels) {
            WaterVO waterVO = new WaterVO();
            switch (orderCancel.getOrderType()){
                case 1:
                    TOrderPrivateCar tOrderPrivateCar = orderPrivateCarService.selectById(orderCancel);
                    if (tOrderPrivateCar == null){
                        continue;
                    }
                    waterVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
                    waterVO.setType("用户订单消费");
                    if (payType!=null){
                        if (!Objects.equals(tOrderPrivateCar.getPayType(), payType)){
                            continue;
                        }
                    }
                    switch (tOrderPrivateCar.getPayType()){
                        case 1:
                            waterVO.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO.setPayType("银行卡支付");
                            break;
                    }
                    // 专车
                    waterVO.setCode(tOrderPrivateCar.getOrderNum());
                    String string = orderCancel.getMoney().toString();
                    waterVO.setMoney(new BigDecimal(string));
                    TUser user1 = appUserService.selectById(tOrderPrivateCar.getUserId());
                    if (user1!=null){
                        waterVO.setName(user1.getNickName());
                        waterVO.setPhone(user1.getPhone());
                    }
                    waterVO.setRemark(tOrderPrivateCar.getRemark());
                    res.add(waterVO);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    break;
                case 2:
                    TOrderLogistics tOrderLogistics1 = orderLogisticsService.selectById(orderCancel.getOrderId());
                    if (payType!=null){
                        if (!Objects.equals(tOrderLogistics1.getPayType(), payType)){
                            continue;
                        }
                    }
                    WaterVO waterVO1 = new WaterVO();
                    waterVO1.setInsertTime(format.format(tOrderLogistics1.getInsertTime()));
                    waterVO1.setType("用户订单消费");
                    // 小件物流
                    waterVO1.setCode(tOrderLogistics1.getOrderNum());
                    String string1 = orderCancel.getMoney().toString();
                    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()){
                        case 1:
                            waterVO1.setPayType("手机支付");
                            break;
                        case 2:
                            waterVO1.setPayType("银行卡支付");
                            break;
                    }
                    waterVO1.setRemark(tOrderLogistics1.getRemark());

                    res.add(waterVO1);
                    userConsume = userConsume.add(new BigDecimal(orderCancel.getMoney().toString()));
                    break;
            }
        }
        // 司机提现
        for (TPubWithdrawal tPubWithdrawal : driver) {
            if(payType!=null && payType == 1){