From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 0eb4503..3a5c51c 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
@@ -244,7 +244,7 @@
      * @param keyType
      * @param key
      * @param state
-     * @param type
+     * @param typeList
      * @param orderState
      * @param startTime
      * @param endTime
@@ -253,11 +253,11 @@
      */
 
     public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
-                                         Integer type, Integer orderState, String startTime, String endTime, Integer source,
+                                         List<Integer> typeList, Integer orderState, String startTime, String endTime, Integer source,
                                          List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system)
             throws CommonOrderException;
 
-    public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+    public long countQuery(Integer keyType, String key, Integer state, List<Integer> typeList, Integer orderState,
                            String startTime, String endTime, Integer source,
                            List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException;
 
@@ -278,7 +278,7 @@
      * @param orderNo
      * @return
      */
-    public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);
+    public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType,SystemEnum system);
 
     /**
      * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�

--
Gitblit v1.8.0