|
@@ -165,7 +165,9 @@ public class TourOrderController {
|
|
String orderBy = MyOrderParam.buildOrderBy(orderParam, TourOrder.class);
|
|
String orderBy = MyOrderParam.buildOrderBy(orderParam, TourOrder.class);
|
|
List<TourOrder> tourOrderList = tourOrderService.getTourOrderListWithRelation(tourOrderFilter, orderBy);
|
|
List<TourOrder> tourOrderList = tourOrderService.getTourOrderListWithRelation(tourOrderFilter, orderBy);
|
|
for(TourOrder item:tourOrderList){
|
|
for(TourOrder item:tourOrderList){
|
|
- item.setRebateSumPrice(tourOrderService.getTourUserRebate(item.getCreateUserId(),item.getGroupPurchaseProgressId()));
|
|
|
|
|
|
+ item.setRebateSumPrice(tourOrderService.getTourUserRebate(
|
|
|
|
+ item.getCreateUserId(),item.getGroupPurchaseProgressId()) == null?
|
|
|
|
+ BigDecimal.ZERO:tourOrderService.getTourUserRebate(item.getCreateUserId(),item.getGroupPurchaseProgressId()));
|
|
}
|
|
}
|
|
return ResponseResult.success(MyPageUtil.makeResponseData(tourOrderList, TourOrderVo.class));
|
|
return ResponseResult.success(MyPageUtil.makeResponseData(tourOrderList, TourOrderVo.class));
|
|
}
|
|
}
|