diff --git a/src/main/java/com/example/demo/domain/vo/RefundAudit.java b/src/main/java/com/example/demo/domain/vo/RefundAudit.java index 727b2e4..3d994d6 100644 --- a/src/main/java/com/example/demo/domain/vo/RefundAudit.java +++ b/src/main/java/com/example/demo/domain/vo/RefundAudit.java @@ -33,6 +33,7 @@ public class RefundAudit { private Integer permanentGold; // 永久金币 private Integer freeGold; // 免费金币 private Integer freeJune; // 6月免费金币 + private String refundType; //退款类型 private Integer freeDecember; // 12月免费金币 private Integer taskGold; // 任务金币 private String remark; // 备注 diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 7ea5776..8ba488c 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -46,7 +46,7 @@ public class AuditServiceImpl implements AuditService { updateOrder.setAuditStatus(2); updateOrder.setRejectReason(rejectReason); updateOrder.setAuditTime(new Date()); - auditMapper.updateOrder(updateOrder); + if (order.getType()==2) { //退款 //2.获取对应的消费订单(退款订单号去掉开头"TK"即为对应消费订单) String consumeOrderCode = order.getOrderCode().replaceFirst("TK", ""); diff --git a/src/main/resources/mapper/AuditMapper.xml b/src/main/resources/mapper/AuditMapper.xml index 0f627ee..aacbef8 100644 --- a/src/main/resources/mapper/AuditMapper.xml +++ b/src/main/resources/mapper/AuditMapper.xml @@ -9,6 +9,8 @@ reject_reason = #{rejectReason}, audit_time = #{auditTime} where order_code = #{orderCode} + order by create_time DESC + limit 1 @@ -34,6 +36,8 @@