From b93c5e0661a6034a20f1ab5c907dce72ce19fc29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E7=9D=A1=E8=A7=89=E7=9A=84=E6=9C=88=E4=BA=AE?= <97796069+Cookies-OvO@users.noreply.github.com> Date: Fri, 5 Dec 2025 09:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E8=AE=B0=E5=BD=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E6=8B=BC=E5=9B=A2=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yzt/common/model/order/StoreOrder.java | 3 +++ .../StoreOrderDetailInfoResponse.java | 3 +++ .../service/impl/OrderServiceImpl.java | 25 +++++++++++++++++++ .../service/impl/StorePinkServiceImpl.java | 1 + 4 files changed, 32 insertions(+) diff --git a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java index 04c327e..40057c8 100644 --- a/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java +++ b/fightwine-common/src/main/java/com/yzt/common/model/order/StoreOrder.java @@ -45,6 +45,9 @@ public class StoreOrder implements Serializable { @ApiModelProperty(value = "详细地址") private String userAddress; + @ApiModelProperty(value = "收货地址ID") + private Integer addressId; + @ApiModelProperty(value = "运费金额") private BigDecimal freightPrice; diff --git a/fightwine-common/src/main/java/com/yzt/common/response/StoreOrderDetailInfoResponse.java b/fightwine-common/src/main/java/com/yzt/common/response/StoreOrderDetailInfoResponse.java index 6bb81e9..ce9066d 100644 --- a/fightwine-common/src/main/java/com/yzt/common/response/StoreOrderDetailInfoResponse.java +++ b/fightwine-common/src/main/java/com/yzt/common/response/StoreOrderDetailInfoResponse.java @@ -149,6 +149,9 @@ public class StoreOrderDetailInfoResponse implements Serializable { @ApiModelProperty(value = "拼团id 0没有拼团") private Integer pinkId; + @ApiModelProperty(value = "拼团编号（排队码）") + private String queueCode; + // @ApiModelProperty(value = "成本价") // private BigDecimal cost; diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java index d306b8c..de67756 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/OrderServiceImpl.java @@ -614,6 +614,30 @@ public class OrderServiceImpl implements OrderService { // 查询发票信息 StoreOrderInvoice invoice = storeOrderInvoiceService.getByOrderId(orderId); storeOrderDetailResponse.setInvoiceInfo(invoice); + + // 查询拼团编号（排队码） + if (StrUtil.isNotBlank(storeOrder.getMark()) && storeOrder.getMark().contains("拼团ID:")) { + try { + // 从 mark 中解析拼团ID，格式：拼团ID:123 达成后免费领取 + String mark = storeOrder.getMark(); + int startIndex = mark.indexOf("拼团ID:") + "拼团ID:".length(); + int endIndex = mark.indexOf(" ", startIndex); + if (endIndex == -1) { + endIndex = mark.length(); + } + String pinkIdStr = mark.substring(startIndex, endIndex).trim(); + Integer pinkId = Integer.parseInt(pinkIdStr); + + // 查询拼团表获取排队码 + StorePink storePink = storePinkService.getById(pinkId); + if (ObjectUtil.isNotNull(storePink) && StrUtil.isNotBlank(storePink.getQueueCode())) { + storeOrderDetailResponse.setQueueCode(storePink.getQueueCode()); + } + } catch (Exception e) { + logger.warn("解析拼团ID失败，订单号: {}, mark: {}", orderId, storeOrder.getMark(), e); + } + } + return storeOrderDetailResponse; } @@ -1274,6 +1298,7 @@ public class OrderServiceImpl implements OrderService { storeOrder.setRealName(request.getRealName()); storeOrder.setUserPhone(request.getPhone()); storeOrder.setUserAddress(userAddressStr); + storeOrder.setAddressId(request.getAddressId()); storeOrder.setVirtualRemark(JSON.toJSONString(virtualRemarkList)); // 如果是自提 if (request.getShippingType() == 2) { diff --git a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java index 169cc73..410ab42 100644 --- a/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java +++ b/fightwine-service/src/main/java/com/yzt/service/service/impl/StorePinkServiceImpl.java @@ -873,6 +873,7 @@ public class StorePinkServiceImpl extends ServiceImpl