From 4e4af90184f5fa5b40d87e2d08d9192bfd237ef0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 30 四月 2021 19:13:58 +0800
Subject: [PATCH] 拼多多备案,京东、拼多多，唯品会，苏宁支持小程序跳转
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 7e4a6b7..08cfae1 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,7 @@
* @param count
* @param uid
* @param state
- * @param type
+ * @param typeList
* @param orderState
* @param startTime
* @param endTime
@@ -182,7 +182,7 @@
*/
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("typeList") List<Integer> typeList, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
@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, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
@@ -204,20 +204,20 @@
*/
List<CommonOrderVO> listQueryWithNoChild(@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("typeList") List<Integer> typeList, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
@Param("endTime") String endTime, @Param("source") Integer source, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
/**
* 缁熻
*/
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("typeList") List<Integer> typeList, @Param("orderState") Integer orderState, @Param("startTime") String startTime,
@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, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
long countQueryWithNoChild(@Param("keyType") Integer keyType, @Param("key") String key,
- @Param("state") Integer state, @Param("type") Integer type, @Param("orderState") Integer orderState,
+ @Param("state") Integer state, @Param("typeList") List<Integer> typeList, @Param("orderState") Integer orderState,
@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("source") Integer source, @Param("payment") BigDecimal payment, @Param("system") SystemEnum system);
/**
--
Gitblit v1.8.0