From 7e37f77192fa701e309fa04f821aa5fd5259ca33 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 01 四月 2020 09:28:31 +0800
Subject: [PATCH] 队员列表
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
index 80e575c..b80b4ca 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
@@ -200,7 +200,9 @@
if (list != null && list.size() > 0) {
// 蹇呴』鏄嚜璐鍗曟墠杩斿埄
HongBaoV2 parent = hongBaoV2Service.selectByPrimaryKey(list.get(0).getHongBaoV2().getId());
- if (parent != null && parent.getUrank() != UserLevelEnum.superVIP.getOrderRank()) {// 涓嶆槸瓒呯骇浼氬憳鐨勮嚜璐�/鍒嗕韩鎵嶈ˉ璐�
+ if (parent != null && parent.getUrank() != UserLevelEnum.superVIP.getOrderRank()
+ && (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS || parent.getType() == HongBaoV2.TYPE_ZIGOU)) {// 涓嶆槸瓒呯骇浼氬憳鐨勮嚜璐�/鍒嗕韩鎵嶈ˉ璐�
+ boolean isShare = (parent.getType() == HongBaoV2.TYPE_SHARE_GOODS);
List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderId);
if (orderList == null || orderList.size() == 0)
@@ -282,7 +284,7 @@
else
orderSubsidy.setLevel(InviteOrderSubsidy.LEVEL_TWO);
// 浼氬憳鎵嶈兘琛ヨ创
- if (userLevel != UserLevelEnum.daRen)
+ if (userLevel != UserLevelEnum.daRen) {
try {
addOrderSubsidy(orderSubsidy);
} catch (OrderTeamRewardException e) {
@@ -290,6 +292,11 @@
} catch (CommonOrderException e) {
throw new InviteOrderSubsidyException(e.getCode(), e.getMsg());
}
+ // 鍒嗕韩璧氫笉鑳戒娇鐢ㄨ繑鍒╁鍔卞埜锛屼笉鐢ㄧ瓑寰�5澶�
+ if (isShare) {
+ validByOrderIdAndSourceType(orderId, sourceType);
+ }
+ }
}
}
}
@@ -337,6 +344,7 @@
InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());
update.setState(InviteOrderSubsidy.STATE_INVALID);
update.setUpdateTime(new Date());
+ update.setInValidTime(new Date());
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
orderTeamRewardService.invalidByOrderIdAndSourceType(subsidy.getId());
}
@@ -368,6 +376,7 @@
InviteOrderSubsidy update = new InviteOrderSubsidy(subsidy.getId());
update.setState(InviteOrderSubsidy.STATE_VALID);
update.setUpdateTime(new Date());
+ update.setValidTime(new Date());
update.setPreGetTime(preGetTime);
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);
orderTeamRewardService.validByOrderIdAndSourceType(subsidy.getId(), preGetTime);
@@ -384,4 +393,18 @@
inviteOrderSubsidyMapper.updateByPrimaryKeySelective(orderSubsidy);
}
+
+ @Override
+ public BigDecimal sumRecievedMoneyByUid(long uid, Integer level) {
+ return inviteOrderSubsidyMapper.sumRecievedMoneyByUid(uid, level);
+ }
+
+ @Override
+ public BigDecimal sumValidMoneyByUidAndDate(long uid, Integer day, Integer level) {
+ return inviteOrderSubsidyMapper.sumValidMoneyByUidAndDate(uid, day, level);
+ }
+
+
+
+
}
--
Gitblit v1.8.0