yovinchen/xlcs
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

修改 Graylog 分布式日志框架

Browse Source
This commit is contained in:
yovinchen
2024-01-10 17:29:02 +08:00
parent c16485dbfb
commit 49543f214f
38 changed files with 67 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/OrderStatus.java
View File

@@ -5,7 +5,7 @@ import lombok.Getter;
@Getter
public enum OrderStatus {
//订单状态【0->待付款；1->待发货；2->待团长收货；3->待用户收货，已完成；-1->已取消】
//订单状态【0->待付款；1->待发货；2->待配送员收货；3->待用户收货，已完成；-1->已取消】
UNPAID(0, "待支付"),
WAITING_DELEVER(1, "待发货"),
WAITING_TAKE(2, "待提货"),

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/enums/UserType.java
View File

@@ -10,7 +10,7 @@ import lombok.Getter;
@Getter
public enum UserType {
USER(0, "会员"),
LEADER(1, "团长");
LEADER(1, "配送员");
@EnumValue
private Integer code;

4
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderDeliver.java
View File

@@ -20,7 +20,7 @@ public class OrderDeliver extends BaseEntity {
@TableField("deliver_date")
private Date deliverDate;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
@TableField("leader_id")
private Long leaderId;
@@ -36,7 +36,7 @@ public class OrderDeliver extends BaseEntity {
@TableField("driver_phone")
private String driverPhone;
@ApiModelProperty(value = "状态（0：默认，1：已发货，2：团长收货）")
@ApiModelProperty(value = "状态（0：默认，1：已发货，2：配送员收货）")
@TableField("status")
private Integer status;

10
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderInfo.java
View File

@@ -73,7 +73,7 @@ public class OrderInfo extends BaseEntity {
@TableField("source_type")
private Integer sourceType;
@ApiModelProperty(value = "订单状态【0->待付款；1->待发货；2->待团长收货；3->待用户收货，已完成；-1->已取消】")
@ApiModelProperty(value = "订单状态【0->待付款；1->待发货；2->待配送员收货；3->待用户收货，已完成；-1->已取消】")
@TableField("order_status")
private OrderStatus orderStatus;
@@ -81,15 +81,15 @@ public class OrderInfo extends BaseEntity {
@TableField("process_status")
private ProcessStatus processStatus;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
@TableField("leader_id")
private Long leaderId;
@ApiModelProperty(value = "团长名称")
@ApiModelProperty(value = "配送员名称")
@TableField("leader_name")
private String leaderName;
@ApiModelProperty(value = "团长手机")
@ApiModelProperty(value = "配送员手机")
@TableField("leader_phone")
private String leaderPhone;
@@ -162,7 +162,7 @@ public class OrderInfo extends BaseEntity {
@TableField("ware_id")
private Long wareId;
@ApiModelProperty(value = "团长佣金")
@ApiModelProperty(value = "配送员佣金")
@TableField("commission_amount")
private BigDecimal commissionAmount;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderItem.java
View File

@@ -61,7 +61,7 @@ public class OrderItem extends BaseEntity {
@TableField("split_total_amount")
private BigDecimal splitTotalAmount;
@ApiModelProperty(value = "团长id（冗余）")
@ApiModelProperty(value = "配送员id（冗余）")
@TableField("leader_id")
private Long leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/order/OrderReturnApply.java
View File

@@ -20,7 +20,7 @@ public class OrderReturnApply extends BaseEntity {
@TableField("order_id")
private Long orderId;
@ApiModelProperty(value = "团长门店id")
@ApiModelProperty(value = "配送员门店id")
@TableField("leader_id")
private Long leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderAccount.java
View File

@@ -16,7 +16,7 @@ public class LeaderAccount extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "团长ID")
@ApiModelProperty(value = "配送员ID")
@TableField("leader_id")
private Long leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBank.java
View File

@@ -14,7 +14,7 @@ public class LeaderBank extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "团长ID")
@ApiModelProperty(value = "配送员ID")
@TableField("leader_id")
private String leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderBill.java
View File

@@ -18,7 +18,7 @@ public class LeaderBill extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "团长ID")
@ApiModelProperty(value = "配送员ID")
@TableField("leader_id")
private Long leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderUser.java
View File

@@ -14,7 +14,7 @@ public class LeaderUser extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "团长ID")
@ApiModelProperty(value = "配送员ID")
@TableField("leader_id")
private String leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/LeaderWithdraw.java
View File

@@ -16,7 +16,7 @@ public class LeaderWithdraw extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "团长ID")
@ApiModelProperty(value = "配送员ID")
@TableField("leader_id")
private String leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/model/user/UserDelivery.java
View File

@@ -18,7 +18,7 @@ public class UserDelivery extends BaseEntity {
@TableField("user_id")
private Long userId;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
@TableField("leader_id")
private Long leaderId;

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderConfirmVo.java
View File

@@ -24,7 +24,7 @@ public class OrderConfirmVo implements Serializable {
@ApiModelProperty(value = "预生产订单号")
private String orderNo;
@ApiModelProperty(value = "用户对应的团长地址")
@ApiModelProperty(value = "用户对应的配送员地址")
private LeaderAddressVo leaderAddressVo;
@ApiModelProperty(value = "购物项列表")

4
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderDeliverVo.java
View File

@@ -18,7 +18,7 @@ public class OrderDeliverVo implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date deliverDate;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
private Long leaderId;
@ApiModelProperty(value = "司机id")
@@ -30,7 +30,7 @@ public class OrderDeliverVo implements Serializable {
@ApiModelProperty(value = "司机电话")
private String driverPhone;
@ApiModelProperty(value = "状态（0：默认，1：已发货，2：团长收货）")
@ApiModelProperty(value = "状态（0：默认，1：已发货，2：配送员收货）")
private Integer status;
}

4
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderMqVo.java
View File

@@ -22,10 +22,10 @@ public class OrderMqVo implements Serializable {
@ApiModelProperty(value = "订单号")
private String orderNo;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
private Long leaderId;
@ApiModelProperty(value = "团长佣金")
@ApiModelProperty(value = "配送员佣金")
private BigDecimal commissionAmount;
@ApiModelProperty(value = "订单项列表")

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderQueryVo.java
View File

@@ -17,7 +17,7 @@ public class OrderQueryVo {
@ApiModelProperty(value = "订单状态")
private OrderStatus orderStatus;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
private Long leaderId;
@ApiModelProperty(value = "仓库id")

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/order/OrderSubmitVo.java
View File

@@ -12,7 +12,7 @@ public class OrderSubmitVo {
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
private Long leaderId;
@ApiModelProperty(value = "收货人姓名")

6
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderAddressVo.java
View File

@@ -19,13 +19,13 @@ public class LeaderAddressVo {
@ApiModelProperty(value = "用户id")
private Long userId;
@ApiModelProperty(value = "团长id")
@ApiModelProperty(value = "配送员id")
private Long leaderId;
@ApiModelProperty(value = "团长名称")
@ApiModelProperty(value = "配送员名称")
private String leaderName;
@ApiModelProperty(value = "团长电话")
@ApiModelProperty(value = "配送员电话")
private String leaderPhone;
@ApiModelProperty(value = "仓库id")

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/LeaderBillQueryVo.java
View File

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
@Data
public class LeaderBillQueryVo {
@ApiModelProperty(value = "团长ID")
@ApiModelProperty(value = "配送员ID")
private String leaderId;
@ApiModelProperty(value = "账单类型")

2
xlcs-parent/model/src/main/java/com/yovinchen/xlcs/vo/user/UserLoginVo.java
View File

@@ -27,7 +27,7 @@ public class UserLoginVo implements Serializable {
@ApiModelProperty(value = "是否新用户")
private Integer isNew;
@ApiModelProperty(value = "当前登录用户团长id")
@ApiModelProperty(value = "当前登录用户配送员id")
private Long leaderId;
@ApiModelProperty(value = "仓库id")