From 912d2e62391b1459952375a60ba87cfa842f1c41 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 17 十二月 2024 10:26:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
index b31cce9..4bedbeb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/CommissionServiceImpl.java
@@ -95,8 +95,8 @@
for (OrderGood og : v) {// 累计分销金额
// 直推上级分佣金额
- Integer superiorType = og.getSuperiorType();
- if (superiorType == 1 && inviteUser != null){
+ String superiorType = og.getSuperiorType();
+ if (superiorType.contains("1") && inviteUser != null){
// 分佣金额
BigDecimal superiorSubcommission = og.getSuperiorSubcommission();
BigDecimal totalDistributionAmount = inviteUser.getTotalDistributionAmount();
@@ -112,7 +112,7 @@
appUserClient.editAppUserById(inviteUser);
}else
// 直帮上级分佣金额
- if (superiorType == 2 && superiorLeader != null){
+ if (superiorType.contains("2") && superiorLeader != null){
// 分佣金额
BigDecimal superiorSubcommission = og.getSuperiorSubcommission();
BigDecimal totalDistributionAmount = superiorLeader.getTotalDistributionAmount();
--
Gitblit v1.7.1