From f0d06601a6be8c09ef5e8e7e76666cb1e8ef72a5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 三月 2020 16:41:55 +0800
Subject: [PATCH] 团队补贴按照下单时间兼容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
index dc5ce6a..dd22ec2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -538,7 +538,8 @@
taoBaoWeiQuanDrawBackMapper.insertSelective(weiQuanDrawBack);// 鍔犲叆杩旇繕璁板綍
// 鍔犲叆閭�璇疯ˉ璐磋繑杩樿褰�
- doInviteOrderSubsidy(orderId, Constant.SOURCE_TYPE_TAOBAO, uid, settleMent, wqMoney,weiQuanOrder.getOrderItemId());
+ doInviteOrderSubsidy(orderId, Constant.SOURCE_TYPE_TAOBAO, uid, settleMent, wqMoney,
+ weiQuanOrder.getOrderItemId());
// 濡傛灉璧勯噾澶т簬0鎵嶆墸闄�
@@ -586,7 +587,7 @@
* @param sourceType
*/
private void doInviteOrderSubsidy(String orderId, int sourceType, Long uid, BigDecimal settleMent,
- BigDecimal weiQuanMoney,String tradeId) throws TaoBaoWeiQuanException {
+ BigDecimal weiQuanMoney, String tradeId) throws TaoBaoWeiQuanException {
InviteOrderSubsidy subSidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, orderId, sourceType);
if (subSidy != null)// 娣诲姞鍊熻捶鍏崇郴
{
@@ -598,6 +599,7 @@
debt.setOriginMoney(drawBackMoney);
debt.setUid(uid);
debt.setCreateTime(new Date());
+ debt.setSourceId(subSidy.getId());
debt.setTradeId(tradeId);
try {
inviteOrderSubsidyDebtService.addDebt(debt);
@@ -605,7 +607,7 @@
throw new TaoBaoWeiQuanException(101, "閭�璇疯鍗曡ˉ璐村紓甯�");
}
- doOrderTeamReard(subSidy.getId(), settleMent, weiQuanMoney,tradeId);
+ doOrderTeamReard(subSidy.getId(), settleMent, weiQuanMoney, tradeId);
}
}
@@ -617,7 +619,7 @@
* void 杩斿洖绫诲瀷
* @throws
*/
- private void doOrderTeamReard(Long subsidyId, BigDecimal settleMent, BigDecimal weiQuanMoney,String tradeId)
+ private void doOrderTeamReard(Long subsidyId, BigDecimal settleMent, BigDecimal weiQuanMoney, String tradeId)
throws TaoBaoWeiQuanException {
List<OrderTeamReward> list = orderTeamRewardService.listBySubsidyId(subsidyId);
if (list != null)
@@ -631,6 +633,7 @@
debt.setUid(reward.getUid());
debt.setCreateTime(new Date());
debt.setTradeId(tradeId);
+ debt.setSourceId(reward.getId());
try {
orderTeamRewardDebtService.addDebt(debt);
} catch (OrderTeamRewardDebtException e) {
--
Gitblit v1.8.0