From 7a25d53a36ce0f6136dc1128ec6c65e8a58f1748 Mon Sep 17 00:00:00 2001 From: yangqingyuan Date: Thu, 8 Aug 2024 15:16:16 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=80=80=E7=A7=9F=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=A2=9E=E5=8A=A0=E6=93=8D=E4=BD=9C=E4=BA=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gxwebsoft/shop/controller/OrderRefundController.java | 5 +++++ src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java index 70608a4..d8573b0 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java @@ -115,6 +115,11 @@ public class OrderRefundController extends BaseController { OrderRefund refund = orderRefundService.getById(orderRefund.getOrderRefundId()); BeanCopier.create(orderRefund, refund, CopyOptions.create().ignoreNullValue()).copy(); + User loginUser = getLoginUser(); + if (loginUser != null) { + refund.setOperator(loginUser.getUsername());//操作人 + } + Integer auditStatus = orderRefund.getAuditStatus(); if(auditStatus.equals(20)){ BigDecimal refundMoney = orderRefund.getRefundMoney(); diff --git a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java index d9334a8..6be7397 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java +++ b/src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java @@ -88,6 +88,9 @@ public class OrderRefund implements Serializable { @TableLogic private Integer deleted; + @ApiModelProperty(value = "操作人") + private String operator; + @ApiModelProperty(value = "商户编码") private String merchantCode;