From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/money/tb/TaoBaoWeiQuanDrawBackService.java |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/tb/TaoBaoWeiQuanDrawBackService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/tb/TaoBaoWeiQuanDrawBackService.java
index cd97ff0..7cab2b1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/money/tb/TaoBaoWeiQuanDrawBackService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/money/tb/TaoBaoWeiQuanDrawBackService.java
@@ -1,5 +1,9 @@
 package com.yeshi.fanli.service.inter.money.tb;
 
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;
 import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;
 
@@ -14,10 +18,12 @@
 
 	/**
 	 * 澶勭悊缁存潈-涓昏鍗曪紙杩斿埄璁㈠崟锛�
-	 * 
-	 * @param hongBao
+	 * @param orderId
+	 * @param subMoneySync - 鏄惁鍚屾鎵ｉ櫎璧勯噾
+	 * @return 鐢ㄦ埛鎵ｆ閲戦鏄犲皠
+	 * @throws TaoBaoWeiQuanException
 	 */
-	public void doWeiQuanFanli(String orderId) throws TaoBaoWeiQuanException;
+	public Map<Long,BigDecimal> doWeiQuanFanli(String orderId,boolean subMoneySync) throws TaoBaoWeiQuanException;
 
 	/**
 	 * 澶勭悊缁存潈-瀛愯鍗曪紙鍒嗕韩璧氾級
@@ -49,4 +55,19 @@
 	 */
 	public  TaoBaoWeiQuanDrawBack selectByHongBaoId(Long hbId);
 
+	/**
+	 * 缁存潈淇℃伅  浜ゆ槗鍙� + uid
+	 * @param orderItemId
+	 * @param uid
+	 * @return
+	 */
+	public TaoBaoWeiQuanDrawBack selectByOrderItemIdAndUid(String orderItemId, Long uid);
+
+	/**
+	 * 閫氳繃浜ゆ槗id鏌ヨ
+	 * @param orderItemId
+	 * @return
+	 */
+	public List<TaoBaoWeiQuanDrawBack> getByOrderItemId(String orderItemId);
+
 }

--
Gitblit v1.8.0