Merge remote-tracking branch 'origin/master'

xuhy

2026-02-12 6a08c16bf7b364086590b533cf5948deaf432a56

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/IXpOrderService.java
#	xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/factory/order/XpOrderClientFallbackFactory.java

@@ -67,6 +67,12 @@
                log.error("根据订单编号查询订单信息查询失败，原因: {}", cause.getMessage());
                return R.fail();
            }

            @Override
            public R<Integer> getOrderNum(String timeStr) {
                log.error("获取订单数量失败，原因: {}", cause.getMessage());
                return R.fail();
            }
        };
    }
}

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/order/XpOrderClient.java

@@ -72,6 +72,14 @@
    @PostMapping("/inner/order/queryOrderByOrderNo")
    R<XpOrder> queryOrderByOrderNo(@RequestParam String orderNo);


    /**
     * 获取订单数量
     *
     * @param timeStr 时间
     * @return 订单数量
     */
    @PostMapping("/inner/order/getOrderNum")
    R<Integer> getOrderNum(String timeStr);



 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java

@@ -104,6 +104,17 @@
    }

    /**
     * 获取订单数量
     *
     * @param timeStr 时间
     * @return 订单数量
     */
    @PostMapping("/inner/order/getOrderNum")
    public  R<Integer> getOrderNum(String timeStr){
        return R.ok(xpOrderService.getOrderNum(timeStr));
    }

    /**
     * 新增订单
     *
     * @param xpOrder 订单信息

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/IXpOrderService.java

@@ -159,6 +159,11 @@

    R payment(XpOrderPayDto dto, String uid);

    /**
     * 添加订单
     * @param xpOrder
     * @return
     */
    boolean addOrder(XpOrder xpOrder);

    /**
@@ -168,4 +173,11 @@
     * @return
     */
    XpVehicle queryVehicleByOrderId(Long orderId, String uid);
    /**
     * 获取订单数量
     * @param timeStr 时间
     * @return
     */
    Integer getOrderNum(String timeStr);

}

 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java

@@ -942,6 +942,13 @@
        return xpVehicle;
    }

    @Override
    public Integer getOrderNum(String timeStr) {
        this.baseMapper.selectCount(new LambdaQueryWrapper<XpOrder>());

        return 0;
    }


    /**
     * 获取当前用户正在执行的订单