From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java | 68 +++++++++++++---------------------
1 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
index ae3a87b..775a485 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComShopOrderDO.java
@@ -1,12 +1,12 @@
package com.panzhihua.service_community.model.dos;
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* @auther lyq
@@ -23,7 +23,7 @@
/**
* 订单id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
@@ -67,7 +67,7 @@
private Long receiverId;
/**
- * 是否已删除（1.是 2.否）
+ * 是否已删除（1.是 2.否）
*/
private Integer deleteStatus;
@@ -97,12 +97,12 @@
private Date payTime;
/**
- * 配送方式（1.商家配送 2.快递物流）
+ * 配送方式（1.商家配送 2.快递物流）
*/
private Integer deliveryType;
/**
- * 订单发货状态（1.未发货 2.已发货）
+ * 订单发货状态（1.未发货 2.已发货）
*/
private Integer deliveryStatus;
@@ -143,10 +143,21 @@
*/
private Date receivingTime;
+ @Override
+ public String toString() {
+ return "ComShopOrderDO{" + "id=" + id + ", storeId=" + storeId + ", userId=" + userId + ", orderNo=" + orderNo
+ + ", payNo=" + payNo + ", wxTardeNo=" + wxTardeNo + ", status=" + status + ", payStatus=" + payStatus
+ + ", receiverId=" + receiverId + ", deleteStatus=" + deleteStatus + ", totalAmount=" + totalAmount
+ + ", discountAmount=" + discountAmount + ", payAmount=" + payAmount + ", payType=" + payType + ", payTime="
+ + payTime + ", deliveryType=" + deliveryType + ", deliveryStatus=" + deliveryStatus + ", logisticsCompany="
+ + logisticsCompany + ", logisticsNo=" + logisticsNo + ", createAt=" + createAt + ", updateAt=" + updateAt
+ + "}";
+ }
+
/**
* 订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)
*/
- public interface status{
+ public interface status {
int dfk = 1;
int dfh = 2;
int dsh = 3;
@@ -158,7 +169,7 @@
/**
* 支付状态(1.未支付 2.已支付)
*/
- public interface payStatus{
+ public interface payStatus {
int no = 1;
int yes = 2;
}
@@ -166,7 +177,7 @@
/**
* 删除状态(1.未删除 2.已删除)
*/
- public interface deleteStatus{
+ public interface deleteStatus {
int no = 1;
int yes = 2;
}
@@ -174,50 +185,23 @@
/**
* 支付方式（1.微信支付）
*/
- public interface payType{
+ public interface payType {
int wx = 1;
}
/**
- * 配送方式（1.商家配送 2.快递物流）
+ * 配送方式（1.商家配送 2.快递物流）
*/
- public interface deliveryType{
+ public interface deliveryType {
int store = 1;
int express = 2;
}
/**
- * 订单发货状态（1.未发货 2.已发货）
+ * 订单发货状态（1.未发货 2.已发货）
*/
- public interface deliveryStatus{
+ public interface deliveryStatus {
int no = 1;
int yes = 2;
- }
-
- @Override
- public String toString() {
- return "ComShopOrderDO{" +
- "id=" + id +
- ", storeId=" + storeId +
- ", userId=" + userId +
- ", orderNo=" + orderNo +
- ", payNo=" + payNo +
- ", wxTardeNo=" + wxTardeNo +
- ", status=" + status +
- ", payStatus=" + payStatus +
- ", receiverId=" + receiverId +
- ", deleteStatus=" + deleteStatus +
- ", totalAmount=" + totalAmount +
- ", discountAmount=" + discountAmount +
- ", payAmount=" + payAmount +
- ", payType=" + payType +
- ", payTime=" + payTime +
- ", deliveryType=" + deliveryType +
- ", deliveryStatus=" + deliveryStatus +
- ", logisticsCompany=" + logisticsCompany +
- ", logisticsNo=" + logisticsNo +
- ", createAt=" + createAt +
- ", updateAt=" + updateAt +
- "}";
}
}
\ No newline at end of file
--
Gitblit v1.7.1