|
|
@@ -504,6 +504,12 @@ public class FsStoreHealthOrderScrmController extends BaseController {
|
|
|
param.setDeliveryImportTimeList(param.getDeliveryImportTimeRange().split("--"));
|
|
|
}
|
|
|
param.setIsHealth("1");
|
|
|
+
|
|
|
+
|
|
|
+ if(param.getStatus() == null) {
|
|
|
+ param.setStatus(2); // 默认查询状态=2(待收货/已发货)的订单
|
|
|
+ }
|
|
|
+
|
|
|
List<FsStoreOrderDeliveryNoteExportVO> storeOrderDeliveryNoteExportVOList=fsStoreOrderService.getDeliveryNote(param);
|
|
|
ExcelUtil<FsStoreOrderDeliveryNoteExportVO> util = new ExcelUtil<>(FsStoreOrderDeliveryNoteExportVO.class);
|
|
|
//通过商品ID获取关键字,安全处理空列表和null keyword的情况
|