|
|
@@ -407,6 +407,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
|
|
|
.page(DatabaseContextHolder.page(param.getPaging()));
|
|
|
Pagination<OmsOrderDTO> pagination = DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
|
|
|
pagination.getRecords().forEach(item -> {
|
|
|
+ item.setMerchantInfo(this.merchantService.getMerchantById(item.getMerchantId()));
|
|
|
List<OmsOrderItemDTO> goodsInfos = this.omsOrderItemService.getOrderItemByOrderId(item.getId());
|
|
|
if(StringUtils.notEmpty(status) && status == 4){
|
|
|
if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(goodsInfos)){
|
