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;