1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

后台管理 -> 订单管理完成;nginx配置文件限制ip并发数

This commit is contained in:
2023-04-23 00:52:43 +08:00
parent 152ff7d8e5
commit 83f424b80f
23 changed files with 696 additions and 32 deletions

View File

@@ -4,7 +4,7 @@ import java.util.Arrays;
import java.util.Optional;
public enum OrderStatus {
PENDING("Pending", "等待确认"),
PENDING("Pending", "等待支付"),
PROCESSING("Processing", "已支付,等待发货中"),
SHIPPED("Shipped", "已发货,等待确认收货"),
DELIVERED("Delivered", "已送达"),

View File

@@ -4,10 +4,12 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@NoArgsConstructor
@Accessors(chain = true) // 链式写法
public class Good {
public class Good implements Serializable {
Long id;
String goodsName;
Integer categoryId;

View File

@@ -4,10 +4,12 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@NoArgsConstructor
@Accessors(chain = true) // 链式写法
public class GoodCategory {
public class GoodCategory implements Serializable {
Long id;
String categoryName;
Integer order;

View File

@@ -4,13 +4,14 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@NoArgsConstructor
@Accessors(chain = true) // 链式写法
public class Order {
public class Order implements Serializable {
private Long id;
private Integer userId;
private LocalDateTime orderDate;

View File

@@ -4,10 +4,12 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@NoArgsConstructor
@Accessors(chain = true) // 链式写法
public class OrderDetail {
public class OrderDetail implements Serializable {
private Long id;
private Long orderId;
private Long goodId;

View File

@@ -0,0 +1,18 @@
package com.cxyxiaomo.epp.common.query;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@NoArgsConstructor
@Accessors(chain = true) // 链式写法
// 微服务必须要实现Serializable
public class OrderQuery implements Serializable {
private Long id;
private Integer userId;
private String orderStatusCode;
private String expressId;
}

View File

@@ -9,7 +9,6 @@ import org.springframework.beans.BeanUtils;
import java.io.Serializable;
import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.List;
import java.util.stream.Collectors;
@@ -22,10 +21,10 @@ import java.util.stream.Collectors;
public class OrderVO implements Serializable {
private String id;
private Integer userId;
private LocalDateTime orderDate;
private String orderStatus;
private String orderStatusCode;
private String orderPrice;
private String orderDate;
private String payDate;
private String cancelDate;
private String shipDate;
@@ -47,6 +46,9 @@ public class OrderVO implements Serializable {
String price = order.getOrderPrice().setScale(2, RoundingMode.FLOOR).toPlainString();
orderVO.setOrderPrice(price);
if (order.getOrderDate() != null) {
orderVO.setOrderDate(order.getOrderDate().toString().replace("T", " "));
}
if (order.getPayDate() != null) {
orderVO.setPayDate(order.getPayDate().toString().replace("T", " "));
}