From a2ae9b3d890bc7fcaa34ab65e5cdaf8ccfa07c2b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 13 十一月 2019 15:35:12 +0800
Subject: [PATCH] 红包弹框加入设备验证
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
index 624e1bd..21967bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java
@@ -174,7 +174,9 @@
List<CommonOrderVO> listQuery(@Param("start") long start, @Param("count") int count,
@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("source") Integer source);
+ @Param("endTime") String endTime, @Param("source") Integer source,
+ @Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+ @Param("minTime")Date minTime, @Param("money")BigDecimal money);
/**
* 璁㈠崟鍒楄〃鏌ヨ(涓嶅寘鍚瓙璁㈠崟)
@@ -201,7 +203,9 @@
*/
long countQuery(@Param("keyType") Integer keyType, @Param("key") String key, @Param("state") Integer state,
@Param("type") Integer type, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("source") Integer source);
+ @Param("endTime") String endTime, @Param("source") Integer source,
+ @Param("listShopId")List<Long> listShopId, @Param("listGoodsId")List<Long> listGoodsId,
+ @Param("minTime")Date minTime, @Param("money")BigDecimal money);
long countQueryWithNoChild(@Param("keyType") Integer keyType, @Param("key") String key,
@Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
@@ -304,7 +308,8 @@
/**
* 鏌ヨ棣栫瑪鏈夋晥鍒拌处璁㈠崟
* @param uid
- * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�
+ * @param typeHB 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇�
+ * @param typeDate 鏃ユ湡绫诲瀷锛� 3鏈湀 4涓婃湀
* @return
*/
CommonOrderVO firstValidOrderByUid(@Param("uid") Long uid, @Param("typeHB") Integer typeHB,
--
Gitblit v1.8.0