|
@@ -39,22 +39,26 @@ public class TaGoodsOrdersServiceImpl extends ServiceImpl<TaGoodsOrdersMapper, T
|
39
|
39
|
IPage<TaGoodsOrders> list= taGoodsOrdersMapper.goodsOrderList(pg,userName,userId,ordersNo,customerId);
|
40
|
40
|
List<Integer> orderIds = new ArrayList<>();
|
41
|
41
|
List<TaGoodsOrders> orders = list.getRecords();
|
42
|
|
- for(int i = 0;i<orders.size();i++){
|
43
|
|
- orderIds.add(orders.get(i).getOrdersId());
|
44
|
|
- }
|
45
|
|
- if(orderIds.size()>0){
|
46
|
|
- List<TaGoodsOrdersDetail>detailList = taGoodsOrdersDetailMapper.selectBatchIds(orderIds);
|
47
|
|
- for (int j = 0;j<orders.size();j++){
|
48
|
|
- List<TaGoodsOrdersDetail>thisDetail = new ArrayList<>();
|
49
|
|
- for(int h = 0; h<detailList.size();h++){
|
50
|
|
- if(orders.get(j).getOrdersId().equals(detailList.get(h).getOrdersId())){
|
51
|
|
- thisDetail.add(detailList.get(h));
|
|
42
|
+ if(orders.size()>0){
|
|
43
|
+ for(int i = 0;i<orders.size();i++){
|
|
44
|
+ orderIds.add(orders.get(i).getOrdersId());
|
|
45
|
+ }
|
|
46
|
+ if(orderIds.size()>0){
|
|
47
|
+ List<TaGoodsOrdersDetail>detailList = taGoodsOrdersDetailMapper.selectBatchIds(orderIds);
|
|
48
|
+ for (int j = 0;j<orders.size();j++){
|
|
49
|
+ List<TaGoodsOrdersDetail>thisDetail = new ArrayList<>();
|
|
50
|
+ for(int h = 0; h<detailList.size();h++){
|
|
51
|
+ if(orders.get(j).getOrdersId().equals(detailList.get(h).getOrdersId())){
|
|
52
|
+ thisDetail.add(detailList.get(h));
|
|
53
|
+ }
|
52
|
54
|
}
|
|
55
|
+ orders.get(j).setDetailList(thisDetail);
|
53
|
56
|
}
|
54
|
|
- orders.get(j).setDetailList(thisDetail);
|
55
|
57
|
}
|
|
58
|
+
|
56
|
59
|
}
|
57
|
60
|
|
|
61
|
+
|
58
|
62
|
responseBean.addSuccess(list);
|
59
|
63
|
return responseBean;
|
60
|
64
|
}
|