Merge branch 'dev-tiande-member' into dev-tiande

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 {

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

@@ -210,9 +210,15 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 	public void generateMemberShareQueue(OrderMemberDetail orderMemberDetail) {
 		if (orderMemberDetail != null) {
 			log.info("会员订单信息: {}", orderMemberDetail);
-			BaseUserMemberLevel baseUserMemberLevel = baseUserMemberLevelMapper.selectOne(new BaseUserMemberLevel(){{setIsdel(0); setId(orderMemberDetail.getMemberLevelId());}});
-			log.info("会员等级信息: {}", baseUserMemberLevel);
-			if (baseUserMemberLevel != null && baseUserMemberLevel.getIsShare() == 1) {
+			Example example = new Example(BaseUserMemberLevel.class);
+			example.createCriteria().andEqualTo("isdel", 0).andEqualTo("isShare", 1);
+			example.orderBy("level");
+			List<BaseUserMemberLevel> baseUserMemberLevelList = baseUserMemberLevelMapper.selectByExample(example);
+			if (baseUserMemberLevelList != null && baseUserMemberLevelList.size() > 0) {
+				//如果购买会员是分成会员低一级会员以及分成会员，才参与分成
+				if (orderMemberDetail.getMemberLevel().compareTo(baseUserMemberLevelList.get(0).getLevel() - 1) >= 0) {
+					//所有分成会员都需要新增一条记录
+					for (BaseUserMemberLevel baseUserMemberLevel : baseUserMemberLevelList) {
 						List<BaseUserMember> baseUserMemberList = baseUserMemberBiz.selectList(new BaseUserMember(){{setIsDel(0); setMemberLevel(orderMemberDetail.getMemberLevel());}});
 						if (baseUserMemberList != null && baseUserMemberList.size() > 0) {
 							List<Integer> userIds = baseUserMemberList.stream().map(BaseUserMember::getUserId).collect(Collectors.toList());
@@ -241,5 +247,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 					}
 				}
 				}
+			}
+	}
 
 }
\ No newline at end of file

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() {{