czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结束时间

Browse Source
This commit is contained in:
wangw
2025-12-17 15:05:59 +08:00
parent 02619a4742
commit 50f03430f2
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-common/cash-common-service/src/main/java/com/czg/order/vo/GbOrderDetailVO.java
View File

@@ -1,9 +1,11 @@
package com.czg.order.vo; package com.czg.order.vo;
import com.alibaba.fastjson2.annotation.JSONField;
import com.czg.order.entity.GbOrderDetail; import com.czg.order.entity.GbOrderDetail;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
/** /**
@@ -18,6 +20,11 @@ public class GbOrderDetailVO extends GbOrderDetail {
* 商品信息 * 商品信息
*/ */
private String wareJson; private String wareJson;
/**
* 结束时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime groupEndTime;
/** /**
* 店铺名称 * 店铺名称
*/ */

1
cash-service/order-service/src/main/java/com/czg/service/order/mapper/GbOrderMapper.java
View File

@@ -18,7 +18,6 @@ public interface GbOrderMapper extends BaseMapper<GbOrder> {
List<GbOrderDetailVO> getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId); List<GbOrderDetailVO> getGbOrderPage(GbOrderQueryParam param, Long shopId, Long mainShopId);
GbOrderDetailVO getGbOrderDetail(Long shopId, Long detailId); GbOrderDetailVO getGbOrderDetail(Long shopId, Long detailId);
List<GbOrderUserVO> getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo); List<GbOrderUserVO> getGbOrderDetailUsers(Long mainShopId, Long shopId, String groupOrderNo);

4
cash-service/order-service/src/main/resources/mapper/GbOrderMapper.xml
View File

@@ -6,7 +6,7 @@
<select id="getGbOrderPage" resultType="com.czg.order.vo.GbOrderDetailVO"> <select id="getGbOrderPage" resultType="com.czg.order.vo.GbOrderDetailVO">
SELECT 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 `user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
FROM FROM
`gb_order_detail` detail `gb_order_detail` detail
@@ -44,7 +44,7 @@
<select id="getGbOrderDetail" resultType="com.czg.order.vo.GbOrderDetailVO"> <select id="getGbOrderDetail" resultType="com.czg.order.vo.GbOrderDetailVO">
SELECT 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 `user`.phone as userPhone,shop.shop_name as shopName,shop.address as shopAddress
FROM FROM
`gb_order_detail` detail `gb_order_detail` detail