From 21243336236f8ac0575885eaedd43a6b8eeca31b Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 15 Jul 2025 15:44:18 +0800
Subject: [PATCH] Merge branch 'xin' into pxb
---
oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 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 a9c58a6..988d692 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,14 +1,19 @@
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;
import cn.hutool.core.bean.copier.CopyOptions;
+
import java.sql.Timestamp;
import java.math.BigDecimal;
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;
import com.baomidou.mybatisplus.annotation.TableName;
@@ -16,10 +21,10 @@
import lombok.Setter;
/**
-* @description /
-* @author lixin
-* @date 2025-06-11
-**/
+ * @author lixin
+ * @description /
+ * @date 2025-06-11
+ **/
@Getter
@Setter
@TableName("sh_order_return")
@@ -44,6 +49,35 @@
@NotBlank
@ApiModelProperty(value = "订单号")
private String orderNum;
+
+ @NotBlank
+ @ApiModelProperty(value = "预计送达时间")
+ private String orderTime;
+
+ @NotBlank
+ @ApiModelProperty(value = "取单号")
+ private String orderStoreNum;
+
+ @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;
@NotNull
@ApiModelProperty(value = "用户")
@@ -110,7 +144,29 @@
@ApiModelProperty(value = "审核信息")
private String auditMessage;
- public void copy(OrderReturn source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ @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