clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

增加订单/子订单的实体模型

This commit is contained in:
clunt 2022-04-24 13:44:05 +08:00
parent fd140c6b3b
commit 5d5398edf4
4 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ghy-order/src/main/java/com/ghy/order/domain/OrderDetail.java
View File

@ -1,11 +1,53 @@
package com.ghy.order.domain;
import com.ghy.common.annotation.Excel;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
/**
* @author clunt
* 细单表(转派后产生的订单)
*/
public class OrderDetail {
@Data
public class OrderDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC)
private Long id;
@Excel(name = "订单编码", cellType = Excel.ColumnType.STRING)
private String code;
@Excel(name = "主单id", cellType = Excel.ColumnType.NUMERIC)
private Integer orderMasterId;
@Excel(name = "主单编码", cellType = Excel.ColumnType.STRING)
private String orderMasterCode;
@Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC)
private Long customerId;
@Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC)
private Integer orderType;
@Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC)
private Integer orderStatus;
@Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC)
private Integer workerId;
@Excel(name = "付款时间", cellType = Excel.ColumnType.STRING)
private String payTime;
@Excel(name = "接单时间", cellType = Excel.ColumnType.STRING)
private String revTime;
@Excel(name = "服务开始时间/上门时间", cellType = Excel.ColumnType.STRING)
private String workBeginTime;
@Excel(name = "服务完成时间", cellType = Excel.ColumnType.STRING)
private String workFinishTime;
}

15
ghy-order/src/main/java/com/ghy/order/domain/OrderDetailGoods.java Normal file
View File

@ -0,0 +1,15 @@
package com.ghy.order.domain;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
/**
* @author clunt
* 拆单后细单关联商品
*/
@Data
public class OrderDetailGoods extends BaseEntity {
}

32
ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java
View File

@ -1,7 +1,9 @@
package com.ghy.order.domain;
import com.ghy.common.annotation.Excel;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* @author clunt
@ -12,4 +14,34 @@ public class OrderMaster extends BaseEntity {
private static final long serialVersionUID = 1L;
@Excel(name = "序号", cellType = Excel.ColumnType.NUMERIC)
private Long id;
@Excel(name = "订单编码", cellType = Excel.ColumnType.STRING)
private String code;
@Excel(name = "消费者用户id", cellType = Excel.ColumnType.NUMERIC)
private Long customerId;
@Excel(name = "订单类型", cellType = Excel.ColumnType.NUMERIC)
private Integer orderType;
@Excel(name = "订单状态", cellType = Excel.ColumnType.NUMERIC)
private Integer orderStatus;
@Excel(name = "付款类型",cellType = Excel.ColumnType.NUMERIC)
private Integer payType;
@Excel(name = "付款状态", cellType = Excel.ColumnType.NUMERIC)
private Integer payStatus;
@Excel(name = "接单师傅id", cellType = Excel.ColumnType.NUMERIC)
private Integer workerId;
@Excel(name = "付款时间间", cellType = Excel.ColumnType.STRING)
private String payTime;
@Excel(name = "接单时间", cellType = Excel.ColumnType.STRING)
private String revTime;
}

12
ghy-order/src/main/java/com/ghy/order/domain/OrderMasterGoods.java Normal file
View File

@ -0,0 +1,12 @@
package com.ghy.order.domain;
import com.ghy.common.core.domain.BaseEntity;
import lombok.Data;
/**
* @author clunt
* 主单关联商品，即所有商品清单
*/
@Data
public class OrderMasterGoods extends BaseEntity {
}