订单

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java

@@ -591,20 +591,17 @@ public class GicOrderController {
                     // 核销导购
                     String verificationClerkName = order.getWriteOffClerkName();
                     vo.setVerificationClerkName(verificationClerkName);
+                    String clerkId = order.getBelongClerkId();
+                    if (StringUtils.isNotEmpty(clerkId)) {
+                        ClerkDTO clerkDTO = this.clerkService.getclerkById(clerkId);
+                        if (null != clerkDTO) {
+                            vo.setBelongClerkName(clerkDTO.getClerkName());
+                        }
+                    }
                     voList.add(vo);
                 }
             }
-            Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
             String enterpriseId = qdto.getEnterpriseId();
-            voList.forEach(item -> {
-                String clerkId = item.getBelongClerkId();
-                if (StringUtils.isNotEmpty(clerkId)) {
-                    ClerkDTO clerkDTO = this.clerkService.getclerkById(clerkId);
-                    if (null != clerkDTO) {
-                        item.setBelongClerkName(clerkDTO.getClerkName());
-                    }
-                }
-            });
             // 评价
             if (evaluteFlag && CollectionUtils.isNotEmpty(orderIdList)) {
                 ServiceResponse<List<StoreEvaluateInfoDTO>> evaluateResp = evaluateDataApiService
@@ -633,6 +630,7 @@ public class GicOrderController {
                     }
                 });
             }
+            Page<OrderListVO> retPage = PageHelperUtils.changePageToCurrentPage(ret.getResult(), OrderListVO.class);
             retPage.setResult(voList);
             return RestResponse.successResult(retPage);
         }