|
@@ -75,7 +75,9 @@ public class WeAppOrderClothDeliveryManController {
|
|
|
|
|
|
LambdaQueryWrapper<OrderDelivery> queryWrapper = new LambdaQueryWrapper<OrderDelivery>();
|
|
|
queryWrapper.eq(OrderDelivery::getDeliveryManId, AuthHolder.userId());
|
|
|
- queryWrapper.eq(OrderDelivery::getDeliveryStatus, appOrderClothDeliveryManQueryDTO.getDeliveryStatus());
|
|
|
+ if(appOrderClothDeliveryManQueryDTO.getDeliveryStatus()!=null){
|
|
|
+ queryWrapper.eq(OrderDelivery::getDeliveryStatus, appOrderClothDeliveryManQueryDTO.getDeliveryStatus());
|
|
|
+ }
|
|
|
queryWrapper.orderByDesc(BaseEntity::getCreateTime);
|
|
|
List<OrderDelivery> orderDeliveryList = orderDeliveryService.page(page
|
|
|
, queryWrapper).getRecords();
|
|
@@ -92,7 +94,12 @@ public class WeAppOrderClothDeliveryManController {
|
|
|
orderDeliveryVO.setStoreName(store.getName());
|
|
|
StoreAddressVO storeAddressVO = new StoreAddressVO();
|
|
|
BeanUtils.copyProperties(store, storeAddressVO);
|
|
|
+ orderDeliveryVO.setStoreAddress(storeAddressVO);
|
|
|
}
|
|
|
+ OrderCloth orderCloth = orderClothService.getOrderClothByOrderNo(orderDelivery.getOrderSn());
|
|
|
+ OrderClothVO orderClothVO = new OrderClothVO();
|
|
|
+ BeanUtils.copyProperties(orderCloth, orderClothVO);
|
|
|
+ orderDeliveryVO.setOrderCloth(orderClothVO);
|
|
|
orderDeliveryVOList.add(orderDeliveryVO);
|
|
|
}
|
|
|
return R.ok(orderDeliveryVOList);
|