From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java | 13 +++----------
1 files changed, 3 insertions(+), 10 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..2f63b16 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;
@@ -220,7 +221,6 @@
public List<Map<String, Object>> countWeiQaunOrderNumber(Integer dateType, String year, String startTime,
String endTime) throws Exception{
return taoBaoWeiQuanOrderMapper.countWeiQaunOrderNumber(dateType, year, startTime, endTime);
-
}
@Override
@@ -240,15 +240,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