From 8948d3e30d31fe7645c66e50d280c256dd3c4b5c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Mar 2023 12:44:02 +0800
Subject: [PATCH] 后台修改

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 11214b8..7659087 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -222,7 +222,12 @@
                         sharePerkAmount,
                         MoneyFlowTypeEnum.DYNAMIC_ACHIEVE.getValue(),
                         mallOrderInfo.getOrderNo(),
-                        FlowTypeEnum.BALANCE.getValue());
+                        "直推奖",
+                        "补贴额度:"+totalScore,
+                        memberId,
+                        2,
+                        FlowTypeEnum.BALANCE.getValue(),
+                        1);
             }
         }
         /**
@@ -281,8 +286,14 @@
             Map<String, List<MallMember>> collect = mallMembers.stream().collect(Collectors.groupingBy(MallMember::getLevel));
             Set<String> set = collect.keySet(); // 得到所有key的集合
             for (String key : set) {
-                List<MallMember> value = collect.get(key);
-                mallMemberTeamPerk.add(value.get(0));
+                /**
+                 * 团队补贴从二星开始
+                 */
+                int compareLevel = MemberLevelEnum.SECOND_LEVEL.compareLevel(key, MemberLevelEnum.SECOND_LEVEL.getType());
+                if(compareLevel > 0){
+                    List<MallMember> value = collect.get(key);
+                    mallMemberTeamPerk.add(value.get(0));
+                }
             }
         }
 
@@ -381,6 +392,7 @@
                         mallMoneyFlow.setOrderNo(orderNo);
                         mallMoneyFlow.setRtMemberId(memberId);
                         mallMoneyFlow.setStatus(2);
+                        mallMoneyFlow.setRemark("补贴额度:"+mallMemberWallet.getTotalScore());
                         mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
                         mallMoneyFlows.add(mallMoneyFlow);
                     }
@@ -457,6 +469,7 @@
                 mallMoneyFlow.setOrderNo(orderNo);
                 mallMoneyFlow.setRtMemberId(memberId);
                 mallMoneyFlow.setStatus(2);
+                mallMoneyFlow.setRemark("补贴额度:"+mallMemberWallet.getTotalScore());
                 mallMoneyFlow.setFlowType(FlowTypeEnum.BALANCE.getValue());
                 mallMoneyFlows.add(mallMoneyFlow);
             }

--
Gitblit v1.9.1