From 241a49f9653aa83d1dcd9bf646208da3157df35a Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Mon, 05 Apr 2021 22:48:14 +0800
Subject: [PATCH] 合并BizUser表与SysVipInfo表 大部分逻辑已经修正 可能存在问题的 1、拼团秒杀 2、分享图 3、分销结算

---
 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 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 5a9729d..8688651 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
@@ -44,9 +44,9 @@
 	
 	public ShopOrder  selectForUpdate(Integer id);
 
-	List<ShopOrder> selectMyOrderByStatus(@Param("userId") String userId, @Param("params") OrderInfoQueryPOJO orderInfoQueryPOJO);
+	List<ShopOrder> selectMyOrderByStatus(@Param("userId") Long userId, @Param("params") OrderInfoQueryPOJO orderInfoQueryPOJO);
 
-	ShopOrder selectOrderInfoById(@Param("userId") String userId, @Param("id") Integer id);
+	ShopOrder selectOrderInfoById(@Param("userId") Long userId, @Param("id") Integer id);
 
 	public ShopOrder  selectMyOrderById(Integer id);
 
@@ -58,12 +58,7 @@
 	 */
 	List<ShopOrder> selectInPageByQueryOfExcel(@Param("record") ShopOrderQueryPOJO orderQuery, @Param("pageVo") PaginationVO pageVo);
 
-	/**
-	 * 根据用户openID查询消费金额
-	 * @param userId
-	 * @return
-	 */
-	Double selectConsumptionSumByUserId(@Param("userId") String userId);
+
 
 	public List<ShopOrder> selectOrdersByIds(@Param("shopId") Long shopId,@Param("comId") Long comId, @Param("list") List<String> list);
 

--
Gitblit v1.9.1