cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

退款bugfix

Browse Source
This commit is contained in:
taozi
2023-04-09 22:01:11 +08:00
parent 265d2e567b
commit 0e70360afd
6 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java
View File

@ -258,7 +258,7 @@ public class StoreOrderController {
@PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')")
public ResponseEntity refund(@Validated @RequestBody YxStoreOrder resources) {
yxStoreOrderService.orderRefund(resources.getOrderId(),resources.getPayPrice(),
ShopCommonEnum.AGREE_1.getValue());
ShopCommonEnum.AGREE_1.getValue(), null);
return new ResponseEntity(HttpStatus.NO_CONTENT);
}

4
yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java
View File

@ -75,7 +75,7 @@ public class StoreAfterSalesController {
// 回滚库存、退积分、退优惠券
storeOrderService.returnStock(salesCheckDto.getOrderCode());
} else {
storeOrderService.orderRefund(salesCheckDto.getOrderCode(), storeAfterSales.getRefundAmount(), 1);
storeOrderService.orderRefund(salesCheckDto.getOrderCode(), storeAfterSales.getRefundAmount(), 1, storeAfterSales.getId());
}
}
return new ResponseEntity<>(salesCheck, HttpStatus.OK);
@ -117,7 +117,7 @@ public class StoreAfterSalesController {
// 回滚库存、退积分、退优惠券
storeOrderService.returnStock(sales.getOrderCode());
} else {
storeOrderService.orderRefund(orderCode, sales.getRefundAmount(), 1);
storeOrderService.orderRefund(orderCode, sales.getRefundAmount(), 1, salesId);
}
return new ResponseEntity<>(HttpStatus.OK);
}