From 271ae63c20fcbe28d29c47f1881138ff6551a2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 六月 2020 19:26:26 +0800
Subject: [PATCH] 唯品会订单bug修复，APP端佣金比例展示错误bug修复
---
fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java | 145 +++++++++++++++++++++--------------------------
1 files changed, 65 insertions(+), 80 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
index 76a48e0..76698d0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/count/HongBaoV2CountService.java
@@ -4,10 +4,11 @@
import java.util.Date;
import java.util.List;
-import com.yeshi.fanli.dto.ChartTDO;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
public interface HongBaoV2CountService {
+
+
/**
* 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
@@ -35,59 +36,6 @@
*/
public Integer countNumberByUid(Long uid);
- /**
- * 缁熻鎬婚噾棰�
- *
- * @param channel
- * 娓犻亾
- * @param dateType
- * 鏃ユ湡鏍煎紡 鏃�-1 鏈�-2 骞�-3
- * @param state
- * 鐘舵��
- * @param years
- * 骞翠唤
- * @param startTime
- * 寮�濮嬫椂闂�
- * @param endTime
- * 缁撴潫鏃堕棿
- * @return
- */
- public List<ChartTDO> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
- String startTime, String endTime) throws Exception;
-
- /**
- * 缁熻鎬婚噾棰�
- *
- * @param channel
- * 娓犻亾
- * @param dateType
- * 鏃ユ湡鏍煎紡 鏃�-1 鏈�-2 骞�-3
- * @param state
- * 鐘舵��
- * @param years
- * 骞翠唤
- * @param startTime
- * 寮�濮嬫椂闂�
- * @param endTime
- * 缁撴潫鏃堕棿
- * @return
- */
- public List<ChartTDO> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
- String startTime, String endTime) throws Exception;
-
- /**
- * 鍒嗙被鍨嬭鍗曟暟涓庢瘮渚�
- *
- * @param dateType
- * @param type
- * @param year
- * @param startTime
- * @param endTime
- * @return
- * @throws Exception
- */
- public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime,
- String endTime) throws Exception;
/**
* 缁熻鎻愭垚璁㈠崟鏁伴噺
@@ -123,22 +71,6 @@
*/
public Date getLastHongBaoTime(Long uid);
- public List<ChartTDO> count24HOderByChannel(String channel, Integer type, String years, String startTime,
- String endTime) throws Exception;
-
- /**
- * 缁熻鎵�鏈夌被鍨嬭鍗曟暟閲�
- *
- * @param dateType
- * @param type
- * @param year
- * @param startTime
- * @param endTime
- * @return
- * @throws Exception
- */
- public List<ChartTDO> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
- String endTime) throws Exception;
/**
* 鏌ヨ閭�璇�=鍒嗕韩濂栭噾
@@ -222,14 +154,6 @@
*/
public BigDecimal getRewardMoneyByInvite(Long uid);
- /**
- * 鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣(date)锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
- * @param uid
- * @param date
- * @param payment
- * @return
- */
- public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment);
/**
* 缁熻涓嶅悓鏃堕棿锛氬鍔�
@@ -238,7 +162,7 @@
* @param hbType
* @return
*/
- public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType);
+ public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource);
/**
* 缁熻绾㈠寘涓暟
@@ -261,6 +185,67 @@
* @return
*/
public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer hbType, Integer orderState, String orderNo,
- Integer moneyState, Integer source, String startTime, String endTime);
+ Integer moneyState, String startTime, String endTime, List<Integer> listSource);
+
+
+ public Long countOrderByTypeAndDate(Integer orderType, String preDay);
+
+ /**
+ * 缁熻璁㈠崟鏁伴噺
+ * @param uid
+ * @param time 涓嬪崟寮�濮嬫椂闂�
+ * @param payment 浠樻閲戦
+ * @param type 璁㈠崟绫诲瀷
+ * @return
+ */
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);
+
+ /**
+ * 缁熻璁㈠崟鏁伴噺
+ * @param uid
+ * @param time 涓嬪崟寮�濮嬫椂闂�
+ * @param payment 浠樻閲戦
+ * @param type 璁㈠崟绫诲瀷 1鑷喘 2鍒嗕韩
+ * @return
+ */
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type);
+
+
+
+ public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+
+ /**
+ * 缁熻杩戞棩鍒拌处鏀跺叆閲戦
+ * @param uid
+ * @param day
+ * @return
+ */
+ public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day);
+
+ /**
+ * 缁熻鏀惰揣閲戦
+ * @param uid
+ * @param minDate
+ * @param maxDate
+ * @return
+ */
+ public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate);
+
+
+ /**
+ * 180澶╁唴鏈敹璐х殑閲戦
+ * @param uid
+ * @return
+ */
+ public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
+
+ /**
+ * 缁熻鏈埌璐︾殑鏁伴噺
+ * @param uid
+ * @param payment
+ * @param type
+ * @return
+ */
+ public long countMyDirectOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type);
}
--
Gitblit v1.8.0