diff --git a/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java b/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java index 623f33a..cf1540b 100644 --- a/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java +++ b/src/main/java/com/aida/seller/module/listing/service/ListingServiceImpl.java @@ -45,6 +45,9 @@ public class ListingServiceImpl extends ServiceImpl w - .like(OrderInfoEntity::getOrderId, keyword) + .like(OrderInfoEntity::getId, keyword) .or() - .inSql(OrderInfoEntity::getOrderId, - "SELECT order_id FROM order_item WHERE product_name LIKE '%" + keyword + "%'") + .inSql(OrderInfoEntity::getId, + "SELECT order_id FROM seller_order_item WHERE product_name LIKE '%" + keyword + "%'") ); } @@ -86,11 +86,11 @@ public class OrderServiceImpl extends ServiceImpl page = this.page(pageParam, queryWrapper); - List orderIds = page.getRecords().stream() - .map(OrderInfoEntity::getOrderId) + List orderIds = page.getRecords().stream() + .map(OrderInfoEntity::getId) .collect(Collectors.toList()); - Map> itemsMap = orderIds.isEmpty() + Map> itemsMap = orderIds.isEmpty() ? Collections.emptyMap() : orderItemMapper.selectList( new LambdaQueryWrapper() @@ -100,12 +100,12 @@ public class OrderServiceImpl extends ServiceImpl voList = page.getRecords().stream().map(order -> { OrderVO vo = new OrderVO(); - vo.setOrderId(order.getOrderId()); + vo.setOrderId(order.getId()); vo.setPrice(order.getTotalPrice()); vo.setBuyerUsername("@" + (order.getBuyerUsername() != null ? order.getBuyerUsername() : "")); vo.setDate(order.getCreateTime()); - List items = itemsMap.getOrDefault(order.getOrderId(), new ArrayList<>()); + List items = itemsMap.getOrDefault(order.getId(), new ArrayList<>()); List itemVOs = items.stream().map(item -> { OrderVO.ItemVO itemVO = new OrderVO.ItemVO(); itemVO.setProductId(item.getProductId()); diff --git a/src/main/java/com/aida/seller/module/order/vo/OrderVO.java b/src/main/java/com/aida/seller/module/order/vo/OrderVO.java index 7917fe4..117696b 100644 --- a/src/main/java/com/aida/seller/module/order/vo/OrderVO.java +++ b/src/main/java/com/aida/seller/module/order/vo/OrderVO.java @@ -14,8 +14,8 @@ public class OrderVO implements Serializable { private static final long serialVersionUID = 1L; - @Schema(description = "订单唯一标识", example = "SP897772698") - private String orderId; + @Schema(description = "订单唯一标识") + private Long orderId; @Schema(description = "商品明细列表") private List items; diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 32d1102..faa6af1 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -4,21 +4,27 @@ # 示例:docker run -e NACOS_NAMESPACE=prod ... # ============================================================ +nacos: + namespace: dev + host: 18.167.251.121:28848 + username: nacos + password: Aidlab123123! + spring: application: name: aida-seller config: - import: optional:nacos:aida-public-${NACOS_NAMESPACE:test}.yml + import: optional:nacos:aida-public-${nacos.namespace}.yml cloud: nacos: discovery: - server-addr: ${NACOS_HOST:18.167.251.121:28848} - namespace: ${NACOS_NAMESPACE:ltx} - username: ${NACOS_USERNAME:nacos} - password: ${NACOS_PASSWORD:Aidlab123123!} + server-addr: ${nacos.host} + namespace: ${nacos.namespace} + username: ${nacos.username} + password: ${nacos.password} config: - server-addr: ${NACOS_HOST:18.167.251.121:28848} - namespace: ${NACOS_NAMESPACE:ltx} + server-addr: ${nacos.host} + namespace: ${nacos.namespace} file-extension: yaml - username: ${NACOS_USERNAME:nacos} - password: ${NACOS_PASSWORD:Aidlab123123!} + username: ${nacos.username} + password: ${nacos.password} diff --git a/src/main/resources/db/schema.sql b/src/main/resources/db/schema.sql index 92e9ad7..4acc633 100644 --- a/src/main/resources/db/schema.sql +++ b/src/main/resources/db/schema.sql @@ -59,7 +59,6 @@ CREATE TABLE seller_designer ( -- 订单主表 CREATE TABLE seller_orders ( id BIGINT PRIMARY KEY COMMENT '主键ID', - order_id VARCHAR(50) NOT NULL COMMENT '订单唯一标识(如 SP897772698)', seller_id BIGINT NOT NULL COMMENT '卖家ID', total_price DECIMAL(10,2) COMMENT '订单总金额(HK$)', buyer_username VARCHAR(100) COMMENT '买家账号',