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/RiderIncomeDetail.java | 74 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java
new file mode 100644
index 0000000..a3fd5e5
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java
@@ -0,0 +1,74 @@
+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-06-18
+**/
+@Getter
+@Setter
+@TableName("qs_rider_income_detail")
+public class RiderIncomeDetail extends BaseEntity implements Serializable {
+
+ @TableId(value = "income_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "收入明细id")
+ private Long incomeId;
+
+ @ApiModelProperty(value = "骑手id")
+ private Long riderId;
+
+ @ApiModelProperty(value = "骑手名字")
+ private String riderName;
+
+ @ApiModelProperty(value = "骑手手机号")
+ private String riderPhone;
+
+ @ApiModelProperty(value = "订单id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNum;
+
+ @ApiModelProperty(value = "收入金额")
+ private BigDecimal incomeAmount;
+
+ @ApiModelProperty(value = "收入类型：1-配送费，2-奖励，3-补贴")
+ private String incomeType;
+
+ @ApiModelProperty(value = "收入日期(YYYY-MM-dd)方便统计")
+ private String incomeDate;
+
+ @ApiModelProperty(value = "收入月份YYYY-MM")
+ private String incomeMonth;
+
+ @ApiModelProperty(value = "订单状态：1-待取货，2-配送中，3-已完成，4-已取消")
+ private String orderStatus;
+
+ @ApiModelProperty(value = "起始地址")
+ private String startAddress;
+
+ @ApiModelProperty(value = "到达终点地址")
+ private String endAddress;
+
+ @ApiModelProperty(value = "送达完成时间")
+ private Timestamp deliveryTime;
+
+ public void copy(RiderIncomeDetail source){
+ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ }
+
+ public static final String COL_RIDER_ID = "rider_id";
+}
--
Gitblit v1.9.3