闲时折扣

src/main/java/com/gogirl/application/order/mall/impl/MallOrderTechnicianServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gogirl.application.order.mall.IMallOrderTechnicianService;
 import com.gogirl.domain.order.mall.MallOrder;
 import com.gogirl.domain.order.mall.MallOrderTechnician;
+import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper;
 import com.gogirl.infrastructure.mapper.order.mall.MallOrderTechnicianMapper;
 import com.gogirl.shared.order.mall.QueryMallOrderAchievementRequest;
@@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -34,13 +36,17 @@ public class MallOrderTechnicianServiceImpl extends ServiceImpl<MallOrderTechnic
     public Page<MallOrderTechnician> queryMallOrderAchievement(QueryMallOrderAchievementRequest request) {
         Page<MallOrderTechnician> mallOrderTechnicianList = baseMapper.queryMallOrderAchievement(new Page<>(request.getPageNum(), request.getPageSize()), request);
 
-        Map<Long, MallOrder> mallOrderMap = mallOrderMapper.selectBatchIds(mallOrderTechnicianList.getRecords().stream()
-                .map(MallOrderTechnician::getMallOrderId).filter(Objects::nonNull).collect(Collectors.toList()))
-                .stream()
-                .collect(Collectors.toMap(MallOrder::getId, mallOrder -> mallOrder, (k1, k2) -> k1));
-        mallOrderTechnicianList.getRecords().forEach(mallOrderTechnician -> {
-            mallOrderTechnician.setMallOrder(mallOrderMap.get(mallOrderTechnician.getMallOrderId()));
-        });
+        List<Long> mallOrderIdList = mallOrderTechnicianList.getRecords().stream()
+                .map(MallOrderTechnician::getMallOrderId).filter(Objects::isNull).collect(Collectors.toList());
+        if (ListUtil.isNotEmpty(mallOrderIdList)) {
+            Map<Long, MallOrder> mallOrderMap = mallOrderMapper.selectBatchIds(mallOrderIdList)
+                    .stream()
+                    .collect(Collectors.toMap(MallOrder::getId, mallOrder -> mallOrder, (k1, k2) -> k1));
+            mallOrderTechnicianList.getRecords().forEach(mallOrderTechnician -> {
+                mallOrderTechnician.setMallOrder(mallOrderMap.get(mallOrderTechnician.getMallOrderId()));
+            });
+        }
+
         return mallOrderTechnicianList;
     }