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 |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 eb69a6b..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 {
+	
+	
 
 	/**
 	 * 缁熻鍘嗗彶鎬诲埌璐﹂噾棰�
@@ -198,6 +200,17 @@
 	 */
 	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);
 
@@ -224,6 +237,15 @@
 	 * @param uid
 	 * @return
 	 */
-	public BigDecimal sumMoneyByANotSettleAndUid(Long uid);
+	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