会员统计信息修改

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

@@ -392,12 +392,9 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
         if (currentLevel == null) {
             return null;
         }
-        //当前会员不分成且下一级也是不分成，直接返回
-        if ( currentLevel.getIsShare() != null && currentLevel.getIsShare() == 0 ) {
-            //下一级不存在、或者下一级不分成，就直接返回
-            if (subLevel == null || (subLevel != null && subLevel.getIsShare() != null && subLevel.getIsShare() == 0)) {
+        //当前会员为最终等级直接返回
+        if ( currentLevel.getLevel().equals(userMemberLevelList.get(userMemberLevelList.size() - 1)) ) {
                 return currentLevel.getLevel();
-            }
         }
         Example example = new Example(BaseUserMemberLevel.class);
         example.createCriteria().andEqualTo("isdel", 0).andEqualTo("isShare", 1);

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

@@ -258,7 +258,7 @@ public class MemberShareRecordBiz extends BaseBiz<MemberShareRecordMapper, Membe
 								memberShareRecord.setOrderTime(orderMemberDetail.getCrtTime());
 								memberShareRecord.setTotalAmount(orderMemberDetail.getBaseOrder().getOrderAmount().multiply(baseUserMemberLevel.getShareAmount()).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP));
 								memberShareRecord.setMemberNum(userIds.size());
-								memberShareRecord.setAmount(baseUserMemberLevel.getShareAmount().divide(new BigDecimal(userIds.size()).setScale(2, BigDecimal.ROUND_HALF_UP)));
+								memberShareRecord.setAmount(baseUserMemberLevel.getShareAmount().divide(new BigDecimal(userIds.size()),2, BigDecimal.ROUND_HALF_UP));
 								StringBuilder stringBuilder = new StringBuilder();
 								userIds.parallelStream().forEach(id -> {
 									stringBuilder.append(",");