From 0c58ced9732208ca07d6b2ad6a8733146c1405d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Mon, 11 Aug 2025 00:17:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=B9=B0=E5=AE=B6?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E3=80=81=E5=95=86=E5=AE=B6=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gxwebsoft/shop/controller/ShopOrderController.java | 1 + src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java | 6 ++++++ .../java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml | 2 +- .../gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java index db5b752..908a7e8 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java @@ -40,6 +40,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; +import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java index d3aea39..fb7d817 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java @@ -87,6 +87,9 @@ public class ShopOrder implements Serializable { private String addressLng; + @Schema(description = "买家备注") + private String buyerRemarks; + @Schema(description = "自提店铺id") private Integer selfTakeMerchantId; @@ -207,6 +210,9 @@ public class ShopOrder implements Serializable { @Schema(description = "订单是否已结算(0未结算 1已结算)") private Integer isSettled; + @Schema(description = "商户备注") + private String merchantRemarks; + @Schema(description = "系统版本号 0当前版本 value=其他版本") private Integer version; diff --git a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml index 490e54f..f6aa55e 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml +++ b/src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*,b.nickname,b.real_name as realName, b.avatar,b.phone as phone + SELECT a.*,b.nickname, b.avatar,b.phone as phone FROM shop_order a LEFT JOIN gxwebsoft_core.sys_user b ON a.user_id = b.user_id diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java index b3fd7c5..cb2264e 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java @@ -91,6 +91,12 @@ import com.gxwebsoft.common.core.service.PaymentCacheService; final Map> collect = goodsList.stream().collect(Collectors.groupingBy(ShopOrderGoods::getOrderId)); list.forEach(d -> { d.setOrderGoods(collect.get(d.getOrderId())); + + // 确保 realName 字段有值，优先使用关联查询的结果，如果为空则使用订单表中的 realName + if (StrUtil.isBlank(d.getRealName())) { + log.debug("订单 {} 的 realName 为空，尝试从其他字段获取", d.getOrderId()); + // 可以根据业务需求添加其他逻辑，比如从 nickname 或其他字段获取 + } }); } return new PageResult<>(list, page.getTotal());