diff --git a/src/main/java/com/aida/seller/module/order/entity/OrderItemEntity.java b/src/main/java/com/aida/seller/module/order/entity/OrderItemEntity.java index 3a9bbf4..7982ca4 100644 --- a/src/main/java/com/aida/seller/module/order/entity/OrderItemEntity.java +++ b/src/main/java/com/aida/seller/module/order/entity/OrderItemEntity.java @@ -29,7 +29,7 @@ public class OrderItemEntity implements Serializable { /** 商品ID */ @JsonSerialize(using = ToStringSerializer.class) - private Long productId; + private Long listingId; /** 商品名称 */ private String productName; @@ -40,9 +40,6 @@ public class OrderItemEntity implements Serializable { /** 成交单价(HK$) */ private BigDecimal price; - /** 购买数量 */ - private Integer quantity; - /** 创建时间 */ @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; diff --git a/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java b/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java index 2bd45e0..b2b7266 100644 --- a/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java +++ b/src/main/java/com/aida/seller/module/order/service/OrderServiceImpl.java @@ -108,7 +108,7 @@ public class OrderServiceImpl extends ServiceImpl items = itemsMap.getOrDefault(order.getId(), new ArrayList<>()); List itemVOs = items.stream().map(item -> { OrderVO.ItemVO itemVO = new OrderVO.ItemVO(); - itemVO.setProductId(item.getProductId()); + itemVO.setProductId(item.getListingId()); itemVO.setProductName(item.getProductName()); itemVO.setThumbnailUrl(minioUtil.processMinioResource(item.getThumbnailUrl(), CommonConstants.MINIO_PATH_TIMEOUT)); return itemVO; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 64ba5cb..c50002e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -30,5 +30,3 @@ minio: default-bucket: aida-user logging: - level: - com.aida: debug diff --git a/src/main/resources/db/schema.sql b/src/main/resources/db/schema.sql index 4a668dc..b4f6beb 100644 --- a/src/main/resources/db/schema.sql +++ b/src/main/resources/db/schema.sql @@ -69,7 +69,6 @@ CREATE TABLE seller_orders ( create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '下单时间', update_time DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', deleted INT(1) DEFAULT 0 COMMENT '是否删除:0-否,1-是', - INDEX idx_order_id (order_id), INDEX idx_seller_id (seller_id), INDEX idx_deleted (deleted), INDEX idx_create_time (create_time) @@ -79,14 +78,13 @@ CREATE TABLE seller_orders ( CREATE TABLE seller_order_item ( id BIGINT PRIMARY KEY COMMENT '主键ID', order_id VARCHAR(50) NOT NULL COMMENT '订单ID', - product_id BIGINT NOT NULL COMMENT '商品ID', + listing_id BIGINT NOT NULL COMMENT '商品ID', product_name VARCHAR(255) COMMENT '商品名称', thumbnail_url VARCHAR(200) COMMENT '商品缩略图URL', price DECIMAL(10,2) COMMENT '成交单价(HK$)', - quantity INT NOT NULL COMMENT '购买数量', create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', deleted INT(1) DEFAULT 0 COMMENT '是否删除:0-否,1-是', INDEX idx_order_id (order_id), - INDEX idx_product_id (product_id), + INDEX idx_listing_id (listing_id), INDEX idx_deleted (deleted) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='订单商品明细表'; diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..a8ff19d --- /dev/null +++ b/src/main/resources/logback-spring.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + ${log.pattern.console} + + + + + + ${log.path}/${log.file.name}-info.log + + ${log.path}/${log.file.name}-info.%d{yyyy-MM-dd}.log + 60 + + + ${log.pattern.file} + + + ERROR + DENY + ACCEPT + + + + + + ${log.path}/${log.file.name}-error.log + + ${log.path}/${log.file.name}-error.%d{yyyy-MM-dd}.log + 60 + + + ${log.pattern.file} + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + + + +