Merge remote-tracking branch 'origin/master'

“mitao”

2026-03-20 60c4cae73d767b374970b1e307f16f8f971f9079

Merge remote-tracking branch 'origin/master'

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

@@ -1562,7 +1562,6 @@
            xpOrderDetail.setOrderId(orderId);
            xpOrderDetail.setType(1);
            xpOrderDetail.setMoney(new BigDecimal(xpPricingCardVo.getDurationPrice()).setScale(2, RoundingMode.HALF_UP));
            xpOrderDetail.setDuration(duration1);
            xpOrderDetails.add(xpOrderDetail);

            BigDecimal totalPrice =BigDecimal.ZERO;
@@ -2318,7 +2317,7 @@
            detail.setType(xpOrderDetail.getType());
            detail.setTime(xpOrderDetail.getTime());
            detail.setMileage(xpOrderDetail.getMileage());
            detail.setDuration(xpOrderDetail.getDuration()*60);
            detail.setDuration((xpOrderDetail.getDuration() == null ? 0 : xpOrderDetail.getDuration())*60);
            detail.setMoney(xpOrderDetail.getMoney());
            if (xpOrderDetail.getDetailType() == 1) {
                start.add(detail);