From 70a26f1853516c050297c91b91d3dcb10f9de6ba Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Fri, 14 Nov 2025 17:00:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E5=BC=8F=E6=8A=9B=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/order/service/OrderInfoService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java index 793905e1f..67067de88 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/OrderInfoService.java @@ -40,11 +40,11 @@ public interface OrderInfoService extends IService { OrderInfo createOrder(OrderInfoAddDTO param) throws ValidateException; - OrderInfo checkOrderPay(CheckOrderPay param) throws OrderValidateException, OrderCancelException; + OrderInfo checkOrderPay(CheckOrderPay param) throws OrderValidateException, OrderCancelException, CzgException; CzgResult mergeOrder(MergeOrderDTO param); - void payCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson,int retryCount); + void payCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson, int retryCount); void refundCallBackOrder(@NotBlank String orderNo, @NotNull JSONObject resultJson); @@ -53,17 +53,19 @@ public interface OrderInfoService extends IService { void expired(Long orderId); OrderInfo createPayOrder(Long shopId, BigDecimal amount, String remark); + void getOrderAmount(List orderDetails, BigDecimalDTO totalAmount, BigDecimalDTO packAmount, BigDecimalDTO tempAmount, LimitRateDTO limitRate, boolean isAllPack, Integer userAllPack, boolean isVipPrice); + Boolean printOrder(Long shopId, OrderInfoPrintDTO orderInfoPrintDTO); Boolean removeOrderDetail(Long shopId, Long orderId, Long detailId); - Boolean cancelledOrder(Long shopId, Long orderId) throws OrderCancelException ; + Boolean cancelledOrder(Long shopId, Long orderId) throws OrderCancelException; Boolean cancelledPlaceOrder(Long shopId, Long orderId, Integer placeNum); - Boolean updatePayOrderId(Long orderId, Long paymentId, String payType, String remark); + Boolean updatePayOrderId(Long orderId, Long paymentId, String payType, String remark); }