From 50f03430f2c630a1388e71b7d2bb833d0a32f83b Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 17 Dec 2025 15:05:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/order/vo/GbOrderDetailVO.java | 7 +++++++ .../java/com/czg/service/order/mapper/GbOrderMapper.java | 1 - .../src/main/resources/mapper/GbOrderMapper.xml | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java index 190d9405f..2b5429e6f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java @@ -1,9 +1,11 @@ package com.czg.order.vo; +import com.alibaba.fastjson2.annotation.JSONField; import com.czg.order.entity.GbOrderDetail; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; import java.util.List; /** @@ -18,6 +20,11 @@ public class GbOrderDetailVO extends GbOrderDetail { * 商品信息 */ private String wareJson; + /** + * 结束时间 + */ + @JSONField(format = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime groupEndTime; /** * 店铺名称 */ diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java index b1800f6c5..951b8ecef 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java @@ -18,7 +18,6 @@ public interface GbOrderMapper extends BaseMapper { List getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId); - GbOrderDetailVO getGbOrderDetail(Long shopId, Long detailId); List getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo); diff --git a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml index 2e16c410d..5ff825d27 100644 --- a/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml +++ b/cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml @@ -6,7 +6,7 @@ SELECT - detail.* ,`order`.ware_json as wareJson,`user`.nick_name as userName, + detail.* ,`order`.ware_json as wareJson,`order`.group_end_time as groupEndTime,`user`.nick_name as userName, `user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress FROM `gb_order_detail` detail