Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-30 2a498d9f65f873cedb74ab5bcb48ad4b845d0622

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java

@@ -961,6 +961,7 @@
        orderPriceWarpper.setWaitTime((m < 10 ? "0" + m : m) + ":" + (s < 10 ? "0" + s : s));
        orderPriceWarpper.setWaitTimePrice(order.getWaitTimePrice() + order.getOutWaitTimePrice());
        orderPriceWarpper.setDiscountAmount(order.getDiscountAmount());
        orderPriceWarpper.setCouponId(order.getCouponId());
        orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
        orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
        orderPriceWarpper.setPayMoney(order.getPayMoney());