From 227b029030818925089cbe91dc1288594a5d4aa9 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Thu, 21 Aug 2025 14:28:58 +0800
Subject: [PATCH] 退款订单
---
oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java
index 06a4865..e6d3787 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java
@@ -1,5 +1,6 @@
package com.oying.modules.sh.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.oying.base.BaseEntity;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
@@ -10,6 +11,8 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+import java.util.Objects;
+import java.util.Set;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -48,6 +51,35 @@
private String orderNum;
@NotBlank
+ @ApiModelProperty(value = "预计送达时间")
+ private String orderTime;
+
+ @NotBlank
+ @ApiModelProperty(value = "取单号")
+ private String orderStoreNum;
+
+ @NotNull
+ @ApiModelProperty(value = "打包费")
+ private BigDecimal packagingPrice;
+
+ @NotNull
+ @ApiModelProperty(value = "配送费")
+ private BigDecimal sendPrice;
+
+ @NotBlank
+ @ApiModelProperty(value = "配送类型")
+ private String sendType;
+
+ @ApiModelProperty(value = "骑手Id")
+ private Long riderId;
+
+ @ApiModelProperty(value = "骑手手机号")
+ private String riderPhone;
+
+ @ApiModelProperty(value = "骑手名称")
+ private String riderName;
+
+ @NotBlank
@ApiModelProperty(value = "支付类型")
private String payType;
@@ -83,7 +115,7 @@
@ApiModelProperty(value = "实付金额")
private BigDecimal actuallyPayPrice;
- @ApiModelProperty(value = "退款价格")
+ @ApiModelProperty(value = "退款金额")
private BigDecimal refundPrice;
@ApiModelProperty(value = "退款状态")
@@ -95,7 +127,7 @@
@ApiModelProperty(value = "退款渠道")
private String channel;
- @ApiModelProperty(value = "退款原因")
+ @ApiModelProperty(value = "退货类型")
private String reason;
@ApiModelProperty(value = "备注")
@@ -116,6 +148,28 @@
@ApiModelProperty(value = "审核信息")
private String auditMessage;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "商品")
+ private Set<OrderReturnProductSnapshot> productSnapshots;
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ OrderReturn info = (OrderReturn) o;
+ return Objects.equals(returnId, info.returnId) &&
+ Objects.equals(returnNum, info.returnNum);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(returnId, returnNum);
+ }
+
public void copy(OrderReturn source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
--
Gitblit v1.9.3