修改首页弹出框的展示

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -116,25 +116,28 @@ public class AdminSalesOrderController {
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
         }
-
+        // 查询条件的店铺信息
         StoreInfo storeInfo = new StoreInfo();
+        // 查询条件的产品信息
         ProductColor productColor = new ProductColor();
         if(salesOrder.getSalesCompanyId() != null){
             storeInfo.setCompanyId(salesOrder.getSalesCompanyId());
             productColor.setTypeCompany(salesOrder.getSalesCompanyId());
         }
+        // 搜索店铺
         List<StoreInfo> listStoreInfo = storeInfoService.listStore(storeInfo);
+        // 搜索物流方式
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
-        salesOrder.setSalesOrderItemList(null);
+        // 查询产品颜色
         List<ProductColor> productColorList = productService.listproductAndColor(productColor);
-        SalesOrder orderNum = salesOrderService.getStatusNum();//查询订单各个状态数量
         ModelAndView mv = new ModelAndView("order/salesOrder/sales_order_list");
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .addNoPro("suSalesOrderItemList")
                 .setModelAndView(salesOrder, mv, "/admin/salesOrder/list_order_page", pagedResult);
-
-        mv.addObject("orderNum",orderNum);
+        salesOrder.setSalesOrderItemList(null);
+        // 查询订单各个状态数量
+        mv.addObject("orderNum",salesOrderService.getStatusNum());
         mv.addObject("listStoreInfo",listStoreInfo);
         mv.addObject("logisticsInfoList",logisticsInfoList);
         mv.addObject("identity",AdminUtils.getLoginAdmin().getAdminDept());