Merge remote-tracking branch 'origin/master'

puzhibing

2023-03-22 ecf282fb285fbba74ff129a4be8a129aa0d8ceb1

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

@@ -74,7 +74,21 @@
     * @return
     * @throws Exception
     */
    OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId, Integer payType) throws Exception;
    OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;


    /**
     * 重新计算费用明细
     * @param orderId
     * @param couponId
     * @param payType
     * @param balance
     * @return
     * @throws Exception
     */
    OrderPriceWarpper calculationOfExpenses(Integer uid, Long orderId, Integer couponId, Integer payType, Double balance) throws Exception;



    /**
     * 获取支付页面的可用优惠券列表