From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderOperation.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderOperation.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderOperation.java
new file mode 100644
index 0000000..e244e95
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderOperation.java
@@ -0,0 +1,56 @@
+package com.oying.modules.rider.domain;
+
+import com.oying.base.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import java.sql.Timestamp;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+* @description /
+* @author pxb
+* @date 2025-06-18
+**/
+@Getter
+@Setter
+@TableName("qs_rider_order_operation")
+public class RiderOrderOperation extends BaseEntity implements Serializable {
+
+ @TableId(value = "operation_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "操作ID")
+ private Long operationId;
+
+ @ApiModelProperty(value = "订单ID")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单编号")
+ private Long orderNum;
+
+ @ApiModelProperty(value = "骑手ID")
+ private Long riderId;
+
+ @ApiModelProperty(value = "骑手手机号")
+ private String riderPhone;
+
+ @ApiModelProperty(value = "骑手手姓名")
+ private String riderName;
+
+ @ApiModelProperty(value = "操作类型：1-接单，2-取货，3-送达，0-取消接单")
+ private String operationType;
+
+ @ApiModelProperty(value = "操作原因")
+ private String operationReason;
+
+ @ApiModelProperty(value = "操作时间")
+ private String operationTime;
+
+ public void copy(RiderOrderOperation source){
+ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ }
+}
--
Gitblit v1.9.3