From b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2019 17:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
index 43804d2..09c2f87 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java
@@ -1,5 +1,6 @@
 package com.yeshi.fanli.service.impl.count;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -240,15 +241,8 @@
 	}
 	
 	@Override
-	public boolean hasRebateAndShareOrder(Long uid) {
-		boolean has = false;
-		
-		long count = commonOrderCountMapper.countValidOrder(uid);
-		if (count > 0) {
-			has = true; 
-		}
-		
-		return has;
+	public BigDecimal getMoneyByOrderNo(String orderNo) {
+		return commonOrderCountMapper.getMoneyByOrderNo(orderNo);
 	}
 	
 	

--
Gitblit v1.8.0