From 41aedac31eb4c5b9f7b98bacec18c45b3926d69c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 27 九月 2019 16:57:54 +0800
Subject: [PATCH] 京东商品 券bug

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 475bb4f..9cbbb53 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
@@ -129,8 +129,8 @@
 	 * @param endTime
 	 * @return
 	 */
-	public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
-			Integer day, Integer source);
+	public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime,
+			Integer day, Integer source, Integer state, Integer stateOrder);
 
 	/**
 	 * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟
@@ -246,7 +246,7 @@
 	 * @param orderNo
 	 * @return
 	 */
-	public JSONObject getRewardJumpInfo(String orderNo);
+	public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);
 
 	/**
 	 * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�

--
Gitblit v1.8.0