Merge branch 'feature/0822_logoff' into test

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -745,16 +745,13 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         List<OmsOrderReturnApplyVo> checkOrder = omsOrderReturnApplyDao.getCheckOrder(userId);
         if (!CollectionUtils.isEmpty(checkOrder)) {
             Map<String, List<OmsOrderReturnApplyVo>> map = checkOrder.stream().collect(Collectors.groupingBy(OmsOrderReturnApplyVo::getPlatformType));
-            orderStatusMap.forEach((k,v) -> {
-                List<OmsOrderReturnApplyVo> omsOrderReturnApplyVos = map.get(k);
-                if (!CollectionUtils.isEmpty(omsOrderReturnApplyVos)) {
-                    Set<CheckStatus> checkStatuses = orderStatusMap.get(k);
-                    if (checkStatuses == null) {
-                        checkStatuses = new HashSet<>();
-                    }
-                    checkStatuses.add(CheckStatus.WAIT_AFTER_SALE);
-                    orderStatusMap.put(k, checkStatuses);
+            map.forEach((k,v) -> {
+                Set<CheckStatus> checkStatuses = orderStatusMap.get(k);
+                if (checkStatuses == null) {
+                    checkStatuses = new HashSet<>();
                 }
+                checkStatuses.add(CheckStatus.WAIT_AFTER_SALE);
+                orderStatusMap.put(k, checkStatuses);
             });
         }
         return orderStatusMap;