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 | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 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 f800284..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
@@ -7,6 +7,8 @@
import com.yeshi.fanli.vo.order.HongBaoV2VO;
public interface HongBaoV2CountService {
+
+
/**
* 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
@@ -152,14 +154,6 @@
*/
public BigDecimal getRewardMoneyByInvite(Long uid);
- /**
- * 鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣(date)锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬 payment 鍏冿紙閫�娆句负澶辨晥
- * @param uid
- * @param date
- * @param payment
- * @return
- */
- public long countValidOrderByUidAndTime(Long uid, Long time, BigDecimal payment);
/**
* 缁熻涓嶅悓鏃堕棿锛氬鍔�
@@ -204,17 +198,54 @@
* @param type 璁㈠崟绫诲瀷
* @return
*/
- public long counOrderByUidAndOrderType(Long uid, BigDecimal payment, int type);
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment);
/**
- * 缁熻宸茬粨绠�
+ * 缁熻璁㈠崟鏁伴噺
* @param uid
- * @param time
- * @param payment
+ * @param time 涓嬪崟寮�濮嬫椂闂�
+ * @param payment 浠樻閲戦
+ * @param type 璁㈠崟绫诲瀷 1鑷喘 2鍒嗕韩
* @return
*/
- public long countOrderByUidAndSettled(Long uid, Long time, BigDecimal payment);
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type);
+
+
- public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState);
+ 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