提交代码

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")

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()));
                             }