Merge remote-tracking branch 'origin/master'

jiangping

2025-07-16 b0a7148f1830eb544af588e49a36163ee5820c7c

 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java

@@ -386,6 +386,29 @@
        if(Objects.isNull(orders)){
            throw new BusinessException(ResponseStatus.DATA_EMPTY);
        }
        orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));

        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                orders.setPriceUnit("元/斤");
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                orders.setPriceUnit("元/人*天");
            }else{
                if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                    orders.setPriceUnit("元/人*天");
                }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                    orders.setPriceUnit("元/人*小时");
                }else{
                    orders.setPriceUnit("元/斤");
                }
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                orders.setPriceUnit("元/天");
            }else if(Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                orders.setPriceUnit("元/次");
            }
        }
        //附件信息
        List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda().eq(Multifile::getObjId,orders.getId())
                .eq(Multifile::getIsdeleted,Constants.ZERO).eq(Multifile::getObjType,Constants.ONE).orderByAsc(Multifile::getId));
@@ -465,6 +488,8 @@
        for (Orders orders:iPage.getRecords()) {
           this.getOrderContent(orders);
           orders.setStatusName(Constants.ordersStatus.getName(orders.getStatus()));
           orders.setEstimatedAccountYuan(Objects.nonNull(orders.getEstimatedAccount())&&orders.getEstimatedAccount()>0?orders.getEstimatedAccount()/100:0L);
           orders.setPayAccountYuan(Objects.nonNull(orders.getPayAccount())&&orders.getPayAccount()>0?orders.getPayAccount()/100:0L);
        }
        return PageData.from(iPage);
    }
@@ -473,22 +498,39 @@
        if(Constants.equalsInteger(orders.getType(),Constants.ZERO)){
            orders.setOrderContent(Constants.workType.getName(orders.getWorkType()) +" | " + orders.getCategoryName());
            if(Constants.equalsInteger(orders.getWorkType(),Constants.ZERO)){
                if(Objects.nonNull(orders.getPriceNum1())){
                orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"斤");
                }
            }else if(Constants.equalsInteger(orders.getWorkType(),Constants.ONE)){
                if(Objects.nonNull(orders.getPriceNum2())) {
                orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"人");
                }
            }else{
                if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)||Constants.equalsInteger(orders.getCarType(),Constants.ONE)){
                    if(Objects.nonNull(orders.getPriceNum2())) {
                    orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum2()+"人");
                    }
                }else{
                    if(Objects.nonNull(orders.getPriceNum1())) {
                    orders.setOrderContent(orders.getOrderContent()+" | " +orders.getPriceNum1()+"斤");
                    }
                }
            }
        }else if(Constants.equalsInteger(orders.getType(),Constants.ONE)){
            orders.setOrderContent(  orders.getCategoryName() + " | " + orders.getTransportTypeName() +" | " + orders.getTransportNum() +"斤");
            if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getCategoryName())){
                orders.setOrderContent(  orders.getCategoryName() +
                        (StringUtils.isEmpty(orders.getTransportTypeName())?"":" | " + orders.getTransportTypeName() ) +
                        (Objects.isNull(orders.getTransportNum())?null:" | " + orders.getTransportNum() +"斤"));
            }

            if(Constants.equalsInteger(orders.getCarType(),Constants.ZERO)){
                if(Objects.nonNull(orders.getPriceNum2())) {
                orders.setOrderContent(orders.getOrderContent()+" | 用车" +orders.getPriceNum2()+"天");
                }
            }else{
                if(Objects.nonNull(orders.getPriceNum2())) {
                orders.setOrderContent(orders.getOrderContent()+" | 用车" +orders.getPriceNum2()+"次");
                }
            }
        }else{
            if(org.apache.commons.lang3.StringUtils.isNotBlank(orders.getWayInfo())){
@@ -1050,6 +1092,8 @@
                        .set(Orders::getUpdateTime,"now()")
                        .set(Orders::getStatus,Constants.ordersStatus.wait)
                        .set(Orders::getPayStatus,Constants.ONE)
                        .set(Orders::getPayTime,"now()")
                        .set(Orders::getPayMethod,Constants.ZERO)
                        .set(Orders::getWxExternalNo,paymentNo)
                        .eq(Orders::getId,orders.getId())
                );
@@ -1069,6 +1113,8 @@
                        .set(Orders::getUpdateTime,"now()")
                        .set(Orders::getStatus,Constants.FOUR)
                        .set(Orders::getPayStatus,Constants.ONE)
                        .set(Orders::getPayTime,"now()")
                        .set(Orders::getPayMethod,Constants.ZERO)
                        .set(Orders::getWxExternalNo,paymentNo)
                        .set(Orders::getFinishTime,"now()")
                        .eq(Orders::getId,orders.getId())
@@ -1308,6 +1354,14 @@

    //todo 自动派单
    public void autoGrabOrders(){
//        String autoConfirmTime = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.AUTO_DISPATCH_DISTANCE).getCode();
//        List<Orders> ordersList = ordersMapper.selectList(new QueryWrapper<Orders>().lambda()
//                .eq(Orders::getStatus,Constants.FOUR).eq(Orders::getCommentStatus,Constants.ZERO)
//                .apply(" DATE_ADD(finish_time, INTERVAL 7 DAY) < now() ")
//                .last("limit 100")
//        );




    }