From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:03:25 +0800
Subject: [PATCH] Merge branch 'div_8'

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
index df938bf..f69c959 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderCountService.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.inter.order;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -63,11 +64,10 @@
 	public Map<String, Object> lastMonthSettleOrderNumber(Long uid);
 
 	/**
-	 *   鏄惁浜х敓璁㈠崟锛氳嚜璐�佸垎浜湁鏁堣鍗曟暟閲�
-	 * @param uid
+	 *  鏍规嵁璁㈠崟鍙�  缁熻濂栧姳鍒稿姞鎴愰噾棰�
+	 * @param orderNo
 	 * @return
 	 */
-	public boolean hasRebateAndShareOrder(Long uid);
-
+	BigDecimal getMoneyByOrderNo(String orderNo);
 
 }

--
Gitblit v1.8.0