update 添加集团名称字段

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java

@@ -315,13 +315,13 @@ public class MemberGroupServiceImpl implements MemberGroupService {
         Map<String, List<OrderBasicInfo>> listMap = orderList.stream().collect(Collectors.groupingBy(OrderBasicInfo::getMemberId));
         MemberGroupConsumptionVO vo = null;
         for (Map.Entry<String, List<OrderBasicInfo>> entry : listMap.entrySet()) {
+            if (CollectionUtils.isEmpty(entry.getValue())) {
+                continue;
+            }
             // 订单根据结算时间倒序，结算时间为null的排在最后(null在前，结算日期正序，之后整个list反转)
             List<OrderBasicInfo> orderBasicInfoList = entry.getValue().stream()
                     .sorted(Comparator.comparing(OrderBasicInfo::getSettlementTime, Comparator.nullsLast(Comparator.reverseOrder())))
                     .collect(Collectors.toList());
-            if (CollectionUtils.isEmpty(orderBasicInfoList)) {
-                continue;
-            }
             vo = new MemberGroupConsumptionVO();
 
             String vinCode = null;
@@ -359,7 +359,7 @@ public class MemberGroupServiceImpl implements MemberGroupService {
         dto.setGroupCode(groupCode);
         dto.setVinCode(vinCode);
         List<OrderListVO> orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto);
-        return null;
+        return orderListVOS;
     }
 
     /**