From 4548c5045b3a5522ad14df7c939f0303c1e17587 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 11 Oct 2025 19:07:29 +0800
Subject: [PATCH] 配送费

---
 oying-system/src/main/java/com/oying/modules/sh/domain/OrderReturn.java |   76 ++++++++++++++++++++++++++++++++++----
 1 files changed, 68 insertions(+), 8 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..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,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,39 @@
     @NotBlank
     @ApiModelProperty(value = "订单号")
     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;
 
     @NotNull
     @ApiModelProperty(value = "用户")
@@ -77,7 +115,7 @@
     @ApiModelProperty(value = "实付金额")
     private BigDecimal actuallyPayPrice;
 
-    @ApiModelProperty(value = "退款价格")
+    @ApiModelProperty(value = "退款金额")
     private BigDecimal refundPrice;
 
     @ApiModelProperty(value = "退款状态")
@@ -89,7 +127,7 @@
     @ApiModelProperty(value = "退款渠道")
     private String channel;
 
-    @ApiModelProperty(value = "退款原因")
+    @ApiModelProperty(value = "退货类型")
     private String reason;
 
     @ApiModelProperty(value = "备注")
@@ -110,7 +148,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