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/RiderOrderRecord.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
new file mode 100644
index 0000000..310b0a4
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderRecord.java
@@ -0,0 +1,99 @@
+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.math.BigDecimal;
+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-07-01
+**/
+@Getter
+@Setter
+@TableName("qs_rider_order_record")
+public class RiderOrderRecord extends BaseEntity implements Serializable {
+
+ @TableId(value = "record_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "骑手订单记录")
+ private Long recordId;
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单编号")
+ private String orderNum;
+
+ @ApiModelProperty(value = "商家ID")
+ private Long merchantId;
+
+ @ApiModelProperty(value = "商家名称")
+ private String merchantName;
+
+ @ApiModelProperty(value = "商家地址")
+ private String merchantAddress;
+
+ @ApiModelProperty(value = "收货地址")
+ private String receiverAddress;
+
+ @ApiModelProperty(value = "订单状态： 1-待取货 2-配送中 3-已完成 4-商家取消 5-骑手取消 6-客户取消 7-系统取消")
+ private String orderStatus;
+
+ @ApiModelProperty(value = "接单时间")
+ private Timestamp acceptTime;
+
+ @ApiModelProperty(value = "接单编号")
+ private String acceptNum;
+
+ @ApiModelProperty(value = "完成/取消时间")
+ private Timestamp finishTime;
+
+ @ApiModelProperty(value = "配送时长（秒）")
+ private Long deliveryDuration;
+
+ @ApiModelProperty(value = "是否超时：1-是 0-否")
+ private String isOvertime;
+
+ @ApiModelProperty(value = "订单来源： 1-平台派单 2-骑手抢单 3-商家直派 4-其他")
+ private String orderSource;
+
+ @ApiModelProperty(value = "订单收入配送费")
+ private BigDecimal orderIncome;
+
+ @ApiModelProperty(value = "骑手姓名")
+ private String riderName;
+
+ @ApiModelProperty(value = "手机号")
+ private String phone;
+
+ @ApiModelProperty(value = "骑手id")
+ private Long riderId;
+
+ @ApiModelProperty(value = "用户经度")
+ private String userLongitude;
+
+ @ApiModelProperty(value = "用户纬度")
+ private String userLatitude;
+
+ @ApiModelProperty(value = "商家经度")
+ private String merchantLongitude;
+
+ @ApiModelProperty(value = "商家纬度")
+ private String merchantLatitude;
+
+ @ApiModelProperty(value = "用户id")
+ private Long userId;
+
+ public void copy(RiderOrderRecord source){
+ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ }
+}
--
Gitblit v1.9.3