From 3b48fad8ca40af68e530a558c8f1ce5b00b76868 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Dec 2022 12:16:03 +0800
Subject: [PATCH] 20221221
---
src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
index 57e3a6b..cb00b93 100644
--- a/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
+++ b/src/main/java/cc/mrbird/febs/mall/quartz/OrderOvertimeJob.java
@@ -111,7 +111,7 @@
returnAmount = avaAmount;
avaAmount = BigDecimal.ZERO;
}else{
- avaAmount = avaAmount.subtract(returnAmount).setScale(BigDecimal.ROUND_DOWN,2);
+ avaAmount = avaAmount.subtract(returnAmount).setScale(2,BigDecimal.ROUND_DOWN);
}
//增加用户金额
memberWalletService.addBalance(returnAmount,mallMember.getId());
@@ -206,6 +206,11 @@
List<MallMember> agentLevelList = mallMemberMapper.selectByAccountLevel(levelSelf);
if(CollUtil.isNotEmpty(agentLevelList)){
for(MallMember mallMember : agentLevelList){
+ //如果代理等级为手动设置，则跳过该会员
+ int levelStatus = ObjectUtil.isEmpty(mallMember.getLevelStatus()) ? 0 : 1;
+ if(1 == levelStatus){
+ continue;
+ }
//有星级的直推
Integer directCnt = mallMemberMapper.selectByRefererIdAndAccountLevel(mallMember.getInviteId(),MemberAccountLevelEnum.NORMAL.getName());
//团队中星级会员数量
--
Gitblit v1.9.1