会员分成记录信息

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberBiz.java

@@ -398,8 +398,17 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                 return currentLevel.getLevel();
             }
         }
+        Example example = new Example(BaseUserMemberLevel.class);
+        example.createCriteria().andEqualTo("isdel", 0).andEqualTo("isShare", 1);
+        example.orderBy("level");
+        List<BaseUserMemberLevel> baseUserMemberLevelList = BaseUserMemberLevelMapper.selectByExample(example);
+        //如果当前等级小于等于第一个分成等级的低一等级, 则直接查询大于等于第一个分成等级的低一等级的下级用户数量， 否则直接取当前等级的低一级会员数量
+        Integer queryLevel = level - 1;
+        if (level <= (baseUserMemberLevelList.get(0).getLevel() - 1)) {
+            queryLevel = baseUserMemberLevelList.get(0).getLevel() - 1;
+        }
         //需要分成，则查询当前用户的下级是否符合条件，符合条件level+1
-        List<BaseUserMember> baseUserMemberList = mapper.selectAllChildrenByLevel(userId, level-1);
+        List<BaseUserMember> baseUserMemberList = mapper.selectAllChildrenByLevel(userId, queryLevel);
         if (baseUserMemberList != null && baseUserMemberList.size() > getLimitNumber()) {
             return generateUserLevel(userId, level+1, userMemberLevelList);
         } else {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -756,7 +756,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 				//发送消息队列到admin，进行分成计算
 				mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, RabbitConstant.KEY_MEMBER_SHARE, JSONUtil.toJsonStr(omd));
 
-
 			} else if (OrderTypeEnum.RENT_VEHICLE.getCode().equals(baseOrder.getType())) {
 				updateOrder.setStatus(OrderStatusEnum.ORDER_TOSTART.getCode());
 				orvd = orderRentVehicleBiz.selectOne(new OrderRentVehicleDetail() {{