From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderDao.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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..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
@@ -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);
@@ -75,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