From 7cf7a80569d3cb907e0260abc3b2dbd36ec6c4c2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Sep 2022 18:08:47 +0800
Subject: [PATCH] Merge branch 'group_buy' of http://120.27.238.55:7000/r/xc-mall into group_buy
---
src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
index f90ce01..3e789f2 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderInfoMapper.java
@@ -57,7 +57,7 @@
MallOrderInfo selectByOrderNo(@Param("orderNo") String orderNo);
- int updateOrderConfirmStatus(@Param("date") Date date);
+ int updateOrderConfirmStatus(@Param("updateTime")DateTime updateTime,@Param("date") Date date);
List<MallOrderInfo> selectOrderInfoWithNormalGoods(@Param("date") Date date);
@@ -68,4 +68,6 @@
List<Map<String, Integer>> selectMemberOrderStatusCntByUniquecode(@Param("uniqueCode")String uniqueCode);
List<MallOrderInfo> selectOrderByStatusAndPayTime(@Param("status")Integer i, @Param("paytime")DateTime offsetDay);
+
+ IPage<MallOrderInfo> selectNewApiOrderListInPage(IPage<MallOrderInfo> page, @Param("record") OrderListDto orderListDto);
}
--
Gitblit v1.9.1