diff --git a/pom.xml b/pom.xml index 39889da9..03810e64 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.10 + 2.7.12 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java b/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java index 49cb5acf..acacd846 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java @@ -67,7 +67,7 @@ public class StoreAfterSalesController { .eq(StoreAfterSales::getOrderCode, salesCheckDto.getOrderCode()) .eq(StoreAfterSales::getId, salesCheckDto.getSalesId()) .one(); - if (storeAfterSales.getServiceType() == 0) { + if (salesCheckDto.getApprovalStatus().equals(0) && storeAfterSales.getServiceType() == 0) { BigDecimal bigDecimal = new BigDecimal("100"); int payPrice = bigDecimal.multiply(storeAfterSales.getRefundAmount()).intValue(); YxStoreOrderQueryVo orderInfo = storeOrderService.getOrderInfo(salesCheckDto.getOrderCode(), null);