From 9a82179d24ec670ba1aefef6906b8acadf58da6e Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期六, 03 八月 2019 12:13:31 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- 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