liujiankang 7 лет назад
Родитель
Сommit
2dc0ebe9f9

+ 0 - 1
watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSalesOrderController.java

@@ -407,7 +407,6 @@ public class AdminSalesOrderController {
             };
             //导出订单Excel并下载
             efastOrderExcel(request,res,cells,orderList);
-
     }
 
 

+ 1 - 2
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -1003,9 +1003,8 @@ public class AdminOrderController {
         ProductColor productColor = null;
         Product product = null;
         Integer salesAmount = 0;
-        String sd_id = NameUtils.getConfig("sd_id");//商店ID(店铺id)
         Date date = new Date();
-        StoreInfo storeInfo = storeInfoService.getStoreInfoByEfastId(sd_id);
+        StoreInfo storeInfo = storeInfoService.getStoreInfoByEfastId(shopId);
         Map<String,SalesOrder> mapsalesOrderList = new HashMap<>();
         int newFaultNum = 0;
         if(orderEfasts == null || orderEfasts.size() <= 0) {