diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 279418bdd..eca0751ee 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1539,7 +1539,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { @Transactional(rollbackFor = Exception.class) @Async public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) { - String brands = "梦天,欧派,志邦";//可追加 + String brands = "梦天,欧派";//可追加 ,志邦 log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId:=" + signingId + "warehouseName:=" + warehouseName + "warehouseId:=" + warehouseId); //查询签收信息 DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java index 09172d8be..2eccd41cc 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java @@ -55,7 +55,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { dto.setOrderPackageCode(orderPackageCode); upShelfPackageList.add(dto); } - if(upShelfPackageList.size() > 0){ + if(!upShelfPackageList.isEmpty()){ return warehouseUpdownTypeService.downPackage(upShelfPackageList,warehouseId,remark); }else{ return R.fail(403,"处理失败"); @@ -66,14 +66,14 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { public R downDeliveryPackage(Map map) { List upShelfPackageList = new ArrayList<>(); String orderPackageCodes = (String) map.get("orderPackageCode"); - String warehouseId = (String) map.get("warehouseId"); + String warehouseId = String.valueOf(map.get("warehouseId")); String[] split = orderPackageCodes.split(","); for(String orderPackageCode:split){ UpShelfPackageDTO dto = new UpShelfPackageDTO(); dto.setOrderPackageCode(orderPackageCode); upShelfPackageList.add(dto); } - if(upShelfPackageList.size() > 0){ + if(!upShelfPackageList.isEmpty()){ return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,Long.parseLong(warehouseId)); }else{ return R.fail(403,"处理失败"); @@ -162,7 +162,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient { ls.add(dto); } - if(ls.size() > 0){ + if(!ls.isEmpty()){ return warehouseUpdownTypeService.downZeroOrder(ls,warehouseId,remark); }else{ return R.fail(403,"处理失败");