diff --git a/src/main/java/com/example/demo/controller/coin/AuditController.java b/src/main/java/com/example/demo/controller/coin/AuditController.java index 21caf58..6bde4fa 100644 --- a/src/main/java/com/example/demo/controller/coin/AuditController.java +++ b/src/main/java/com/example/demo/controller/coin/AuditController.java @@ -53,7 +53,7 @@ public class AuditController { @PostMapping("audit") public ResponseEntity> auditOrder(@RequestBody AuditRequest request) throws Exception { boolean result = auditService.auditOrder(request.getToken(), request.getOrderCode(), request.getAuditId(), - request.getAction(), request.getRejectReason(), request.getPrice(), request.getLinkId() + request.getAction(), request.getRejectReason(), request.getPrice(), request.getLinkId(), request.getRefundModel() ); Map resp = new HashMap<>(); diff --git a/src/main/java/com/example/demo/domain/vo/coin/AuditRequest.java b/src/main/java/com/example/demo/domain/vo/coin/AuditRequest.java index 1db63eb..771dc24 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/AuditRequest.java +++ b/src/main/java/com/example/demo/domain/vo/coin/AuditRequest.java @@ -19,5 +19,6 @@ public class AuditRequest { private String sortOrder; //排序顺序 private BigDecimal price; //原价 private String linkId;//标识 + private Integer refundModel; } \ No newline at end of file diff --git a/src/main/java/com/example/demo/service/coin/AuditService.java b/src/main/java/com/example/demo/service/coin/AuditService.java index 5f4a438..d16fe72 100644 --- a/src/main/java/com/example/demo/service/coin/AuditService.java +++ b/src/main/java/com/example/demo/service/coin/AuditService.java @@ -19,7 +19,7 @@ import java.math.BigDecimal; public interface AuditService { //审核订单并修改用户余额等 - boolean auditOrder(String token, String orderCode, Integer auditId, Integer action, String rejectReason, BigDecimal price, String linkId) throws Exception; + boolean auditOrder(String token, String orderCode, Integer auditId, Integer action, String rejectReason, BigDecimal price, String linkId, Integer refundModel) throws Exception; //多条件查询充值审核订单 PageInfo selectRechargeBy(Integer pageNum, Integer pageSize, RechargeAudit rechargeAudit); //多条件查询退款审核订单 diff --git a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java index 8f8be0d..00e6305 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java @@ -72,7 +72,7 @@ public class AuditServiceImpl implements AuditService { */ @Transactional(rollbackFor = Exception.class) @Override - public boolean auditOrder(String token, String orderCode, Integer auditId, Integer action, String rejectReason, BigDecimal price, String linkId) throws Exception { + public boolean auditOrder(String token, String orderCode, Integer auditId, Integer action, String rejectReason, BigDecimal price, String linkId ,Integer refundModel) throws Exception { if (linkId == null) { linkId = orderCode; @@ -254,7 +254,12 @@ public class AuditServiceImpl implements AuditService { refundRecord.setType(2); // 退款类型 refundRecord.setAmount(refundAmount.intValue()); // 🔥 退款存正数 refundRecord.setOrderCode(order.getOrderCode()); - refundRecord.setDescription("订单退款"); + if(refundModel==0){ + refundRecord.setDescription("全部退款"); + }else{ + refundRecord.setDescription("部分退款"); + } + refundRecord.setStatus(0); walletService.addUserWalletRecord(refundRecord);