gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：退租审核增加操作人字段

Browse Source
This commit is contained in:
yangqingyuan
2024-08-08 15:16:16 +08:00
parent edebd6f970
commit 7a25d53a36
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/gxwebsoft/shop/controller/OrderRefundController.java
View File

@@ -115,6 +115,11 @@ public class OrderRefundController extends BaseController {
OrderRefund refund = orderRefundService.getById(orderRefund.getOrderRefundId()); OrderRefund refund = orderRefundService.getById(orderRefund.getOrderRefundId());
BeanCopier.create(orderRefund, refund, CopyOptions.create().ignoreNullValue()).copy(); BeanCopier.create(orderRefund, refund, CopyOptions.create().ignoreNullValue()).copy();
User loginUser = getLoginUser();
if (loginUser != null) {
refund.setOperator(loginUser.getUsername());//操作人
}
Integer auditStatus = orderRefund.getAuditStatus(); Integer auditStatus = orderRefund.getAuditStatus();
if(auditStatus.equals(20)){ if(auditStatus.equals(20)){
BigDecimal refundMoney = orderRefund.getRefundMoney(); BigDecimal refundMoney = orderRefund.getRefundMoney();

3
src/main/java/com/gxwebsoft/shop/entity/OrderRefund.java
View File

@@ -88,6 +88,9 @@ public class OrderRefund implements Serializable {
@TableLogic @TableLogic
private Integer deleted; private Integer deleted;
@ApiModelProperty(value = "操作人")
private String operator;
@ApiModelProperty(value = "商户编码") @ApiModelProperty(value = "商户编码")
private String merchantCode; private String merchantCode;