From a1c22dc7beef7beee4e6bb702ac254cf9f172f8e Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Fri, 12 Sep 2025 15:08:40 +0800
Subject: [PATCH] 订单备货接单并行
---
oying-system/src/main/java/com/oying/modules/sh/domain/OrderAddressSnapshot.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderAddressSnapshot.java b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderAddressSnapshot.java
index 4c25323..5a0b697 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/domain/OrderAddressSnapshot.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/domain/OrderAddressSnapshot.java
@@ -1,23 +1,27 @@
package com.oying.modules.sh.domain;
-import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
+
import java.math.BigDecimal;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
+
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Getter;
+import lombok.Setter;
/**
-* @description /
-* @author lixin
-* @date 2025-06-11
-**/
-@Data
+ * @author lixin
+ * @description /
+ * @date 2025-06-11
+ **/
+@Getter
+@Setter
@TableName("sh_order_address_snapshot")
public class OrderAddressSnapshot implements Serializable {
@@ -26,8 +30,8 @@
private Long snapshotId;
@NotNull
- @ApiModelProperty(value = "订单ID")
- private Long orderId;
+ @ApiModelProperty(value = "订单号")
+ private String orderNum;
@NotBlank
@ApiModelProperty(value = "收货人姓名")
@@ -49,6 +53,10 @@
@ApiModelProperty(value = "街道")
private String street;
+ @ApiModelProperty(value = "短地址")
+ @NotBlank
+ private String shortAddress;
+
@NotBlank
@ApiModelProperty(value = "详细地址")
private String detail;
@@ -64,7 +72,7 @@
@ApiModelProperty(value = "地址标签(家/公司/学校等)")
private String tag;
- public void copy(OrderAddressSnapshot source){
- BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ public void copy(OrderAddressSnapshot source) {
+ BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
}
}
--
Gitblit v1.9.3