From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java | 15 ---------------
1 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
index f06dc8b..c340ab6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/TaoBaoOrderMapper.java
@@ -5,9 +5,7 @@
import org.apache.ibatis.annotations.Param;
-import com.yeshi.fanli.entity.admin.ReslutOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
-import com.yeshi.fanli.vo.order.TaoBaoOrderVO;
public interface TaoBaoOrderMapper {
@@ -29,13 +27,6 @@
// 鏍规嵁璁㈠崟鍙峰垹闄ゆ暟鎹�
int deleteByOrderId(String orderId);
-
- List<ReslutOrder> queryJoinHongBao(@Param("start") int start, @Param("count") int count, @Param("key") String key,
- @Param("startTime") String startTime, @Param("endTime") String endTime,
- @Param("type")Integer type,@Param("days") Integer days);
-
- int countQueryJoinHongBao( @Param("key") String key,@Param("startTime") String startTime,
- @Param("endTime") String endTime, @Param("type")Integer type,@Param("days") Integer days);
/**
* 缁熻--璁㈠崟绫诲瀷鍖哄垎
@@ -81,10 +72,4 @@
@Param("startTime")String startTime, @Param("endTime")String endTime);
- List<TaoBaoOrderVO> listQuery(@Param("start")long start, @Param("count") int count, @Param("key") String key,
- @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("state")Integer state);
-
- long countQuery(@Param("key") String key, @Param("startTime") String startTime,@Param("endTime") String endTime,
- @Param("state")Integer state);
-
}
\ No newline at end of file
--
Gitblit v1.8.0