From f11cd5aa3a2e06171ccbbf6c76dbb8fa0c5e7398 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Sat, 08 May 2021 22:46:31 +0800
Subject: [PATCH] 合并代码
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java
index 8688651..a161313 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java
@@ -70,9 +70,11 @@
public int selectShopOrderTotalByApplyId(@Param("applyId") Long applyId);
- public List<Map<String,Object>> selectOrderStatusCount(String openId);
+ public List<Map<String,Object>> selectOrderStatusCount(Long userId);
public int batchUpdateOrderStatus(@Param("list") List<ShopOrder> list);
+ public ShopOrder selectShopOrderByOrderNo(@Param("orderNo")String orderNo);
+
}
\ No newline at end of file
--
Gitblit v1.9.1