From 8f173d836338a7727cd67c63d9f01ec7399dc763 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Fri, 3 Nov 2023 14:35:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cweb/src/main/java/com/cweb/config/AuthConfig.java | 1 + .../java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cweb/src/main/java/com/cweb/config/AuthConfig.java b/cweb/src/main/java/com/cweb/config/AuthConfig.java index 275d93d..a26962d 100644 --- a/cweb/src/main/java/com/cweb/config/AuthConfig.java +++ b/cweb/src/main/java/com/cweb/config/AuthConfig.java @@ -93,6 +93,7 @@ public class AuthConfig implements WebMvcConfigurer { .excludePathPatterns("/tradeOrder/createMicroOrder") .excludePathPatterns("/tradeOrder/createJSAPIOrder") .excludePathPatterns("/tradeOrder/createOrder") + .excludePathPatterns("/tradeOrder/cancelOrder") .excludePathPatterns("/tradeOrder/getOrderByOutTradeOrder") .excludePathPatterns("/tradeOrderRefund/refund") .excludePathPatterns("/payQrCode/getQrCodeDetail") diff --git a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java index 03ba4bf..6647d14 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java @@ -279,7 +279,7 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService { tradeOrder.setRebateActivityPrice(rebateActivity.getPrice()); // 优惠折扣 - BigDecimal priceRate = tradeOrder.getRebateActivityPrice().divide(new BigDecimal("10")).setScale(2, BigDecimal.ROUND_DOWN); + BigDecimal priceRate = tradeOrder.getRebateActivityPrice().divide(new BigDecimal("100")).setScale(2, BigDecimal.ROUND_DOWN); tradeOrder.setRebateActivityActualPrice(tradeOrder.getTradeActualAmount().subtract(tradeOrder.getTradeActualAmount().multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP))); tradeOrder.setTradeActualAmount(tradeOrder.getTradeActualAmount().subtract(tradeOrder.getRebateActivityActualPrice())); }