|
|
|
@@ -3046,7 +3046,7 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
public PageInfo<WxOrderCouponVo> listGoodsCAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { |
|
|
|
// WxBatchOrder batchOrderQ = new WxBatchOrder(); |
|
|
|
// batchOrderQ.updateTenantInfo(record); |
|
|
|
// batchOrderQ.setPayVendor(record.getPayVendor());; |
|
|
|
// batchOrderQ.setPayVendor(record.getPayVendor()); |
|
|
|
// PageInfo<WxBatchOrder> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBatchOrderMapper.findCOrderList(batchOrderQ)); |
|
|
|
// page.getList().stream().forEach(oc->{ |
|
|
|
// record.setComposeOrderId(oc.getComposeOrderId()); |
|
|
|
@@ -3061,6 +3061,40 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
// return page; |
|
|
|
return null; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxBatchOrder> listBatchOrderAsPage(WxOrder wxOrder, Integer pageNum, Integer pageSize) { |
|
|
|
|
|
|
|
WxBatchOrder batchOrderQ = new WxBatchOrder(); |
|
|
|
batchOrderQ.updateTenantInfo(wxOrder); |
|
|
|
batchOrderQ.setCUserId(wxOrder.getCUserId()); |
|
|
|
batchOrderQ.setPayVendor(wxOrder.getPayVendor()); |
|
|
|
List<Long> composeOrderIds = wxOrderMapper.getComposeOrderIds(wxOrder); |
|
|
|
if(composeOrderIds == null || composeOrderIds.isEmpty()){ |
|
|
|
batchOrderQ.setId(-999L); |
|
|
|
}else{ |
|
|
|
batchOrderQ.setIds(composeOrderIds); |
|
|
|
} |
|
|
|
PageInfo<WxBatchOrder> page = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBatchOrderMapper.findCOrderList(batchOrderQ)); |
|
|
|
List<Long> batchOrderIds = page.getList().stream().map(WxBatchOrder::getId).collect(Collectors.toList()); |
|
|
|
if(batchOrderIds.size() > 0){ |
|
|
|
Map<Long,List<WxOrderCouponVo>> batchOrderMap = getBatchOrderMap(wxOrder,batchOrderIds); |
|
|
|
page.getList().stream().forEach(oc->{ |
|
|
|
oc.setOrders(batchOrderMap.get(oc.getId())); |
|
|
|
}); |
|
|
|
} |
|
|
|
return page; |
|
|
|
} |
|
|
|
|
|
|
|
private Map<Long,List<WxOrderCouponVo>> getBatchOrderMap(TenantEntity tenantEntity,List<Long> batchOrderIds){ |
|
|
|
WxOrder recordQ = new WxOrder(); |
|
|
|
recordQ.updateTenantInfo(tenantEntity); |
|
|
|
recordQ.setComposeOrderIds(batchOrderIds); |
|
|
|
List<WxOrder> listOfCUser = wxOrderMapper.findListOfCUser(recordQ); |
|
|
|
List<WxOrderCouponVo> wxOrderCouponVos = toOrderCouponVoList(tenantEntity, listOfCUser, false); |
|
|
|
Map<Long, List<WxOrderCouponVo>> map = wxOrderCouponVos.stream().collect(Collectors.groupingBy(WxOrderCouponVo::getComposeOrderId)); |
|
|
|
return map; |
|
|
|
} |
|
|
|
// private List<WxOrderCouponVo> batchOderToOrderCouponVoList(List<WxBatchOrder> batchOrderList) { |
|
|
|
// if (null == batchOrderList || batchOrderList.size() <= 0 ) { |
|
|
|
// return null; |
|
|
|
|