From 457265eb82265650cf6c87519803975f23bd2fd3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 18:33:21 +0800
Subject: [PATCH] 订单统计与返利到账集成测试相关的bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamSubsidyManager.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamSubsidyManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamSubsidyManager.java
index 67f687e..fce93c5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamSubsidyManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamSubsidyManager.java
@@ -3,7 +3,6 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -25,7 +24,6 @@
import com.yeshi.fanli.exception.money.TeamEincomeRecordException;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;
-import com.yeshi.fanli.exception.order.OrderTeamRewardException;
import com.yeshi.fanli.exception.order.TaoBaoOrderException;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2SettleTempService;
import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService;
@@ -36,7 +34,6 @@
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.TimeUtil;
/**
* 鍥㈤槦鍒嗙孩绠＄悊
@@ -71,7 +68,7 @@
private TeamEincomeManager teamEincomeManager;
public void addOrUpdateOrder(String orderNo, int sourceType)
- throws InviteOrderSubsidyException, OrderTeamRewardException, CommonOrderException {
+ throws InviteOrderSubsidyException, CommonOrderException {
inviteOrderSubsidyService.addOrUpdateByOrder(orderNo, sourceType);
}
@@ -130,16 +127,12 @@
* void 杩斿洖绫诲瀷
* @throws
*/
- @Transactional
- public void addToTeamEincome(Long uid, String taskKey)
+ @Transactional(rollbackFor=Exception.class)
+ public void addToTeamEincome(Long uid, String taskKey,Date preGetTime)
throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException {
// 鏌ヨkey
List<HongBaoV2SettleTemp> list = hongBaoV2SettleTempService.listByKey(taskKey);
if (list != null && list.size() > 0) {
- Calendar ca = Calendar.getInstance();
- Date date = new Date(TimeUtil.convertToTimeTemp(
- ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1) + "-25", "yyyy-M-dd"));
-
Integer sourceType = null;
List<InviteOrderSubsidy> subsidyList = new ArrayList<>();
for (HongBaoV2SettleTemp temp : list) {
@@ -163,7 +156,7 @@
throw new OrderMoneySettleException(1, "璁㈠崟绫诲瀷鏈幏鍙栧埌");
if (subsidyList.size() > 0) {
- BigDecimal debtMoney = inviteOrderSubsidyDebtService.getTotalDebtMoney(uid, date);
+ BigDecimal debtMoney = inviteOrderSubsidyDebtService.getTotalDebtMoney(uid, preGetTime);
BigDecimal originalDebtMoney = new BigDecimal(debtMoney.toString());// 鎬荤殑娆犳
List<InviteOrderSubsidy> copySubsidyList = new ArrayList<>();
copySubsidyList.addAll(subsidyList);
@@ -175,7 +168,7 @@
BigDecimal bannce = null;
if (repayMoney.compareTo(new BigDecimal(0)) > 0) {
try {
- bannce = inviteOrderSubsidyDebtService.repayDebtByUid(uid, date, repayMoney);
+ bannce = inviteOrderSubsidyDebtService.repayDebtByUid(uid, preGetTime, repayMoney);
// 鍓╀綑鐨勮ˉ璐撮噾棰�
} catch (InviteOrderSubsidyDebtException e) {
throw new OrderMoneySettleException(2, "杩樻寮傚父");
@@ -193,7 +186,7 @@
}
// 鍔犲叆鍥㈤槦鏀剁泭涓棿琛�
- teamEincomeManager.addTeamSubsidy(uid, date, totalMoney, sourceType);
+ teamEincomeManager.addTeamSubsidy(uid, preGetTime, totalMoney, sourceType);
}
}
}
--
Gitblit v1.8.0