From b3f5e5ba3fd436f00f73cef1de6e8208fe6cf8c4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 六月 2020 10:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index b95d9ae..c7bbf51 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -22,6 +22,7 @@
import net.sf.json.JSONObject;
public interface CommonOrderService {
+
public int insert(CommonOrder record);
@@ -443,10 +444,10 @@
*/
public List<CommonOrderVO> getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType,
- List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException, Exception;
+ List<Integer> listSource) throws CommonOrderException, Exception;
long countOrderList(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
- String endTime, Integer dateType, List<Integer> listSource, boolean notBackSuVip) throws CommonOrderException;
+ String endTime, Integer dateType, List<Integer> listSource);
/**
* 缁存潈閲戦璁＄畻
--
Gitblit v1.8.0