From 788deca1b4a24f8a24e49c24f7d89975a1d74bbe Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 03 十一月 2019 23:31:25 +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 475bb4f..713aa4c 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
@@ -79,7 +79,7 @@
 	 */
 	public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
 			Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
-			throws CommonOrderException;
+			throws CommonOrderException,Exception;
 
 	/**
 	 * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
@@ -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