cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决订单批量导出报错

Browse Source
This commit is contained in:
xwb
2020-05-01 23:00:39 +08:00
parent 7fe99a5ce2
commit c9e87de453
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java
View File

@ -389,11 +389,11 @@ public class StoreOrderController {
@RequestParam(name = "orderType") String orderType,
@RequestParam(name = "listContent") String listContent) throws IOException, ParseException {
List<YxStoreOrderDTO> list = (List)getYxStoreList(criteria, pageable, orderStatus, orderType).get("content");
List<String> idList = JSONArray.parseArray(listContent).toJavaList(String.class);
List<YxStoreOrderDTO> yxStoreOrderDTOS = new ArrayList<>();
if(StringUtils.isEmpty(listContent)){
yxStoreOrderService.download(list, response);
}else {
List<String> idList = JSONArray.parseArray(listContent).toJavaList(String.class);
List<YxStoreOrderDTO> yxStoreOrderDTOS = new ArrayList<>();
for(YxStoreOrderDTO yx : list){
for(String ids : idList){
if(yx.getOrderId().equals(ids)){
@ -484,4 +484,4 @@ public class StoreOrderController {
}
}
}