Browse Source

fix: 修复String map 转Stirng 报错

pull/13/head
pref_mail@163.com 10 months ago
parent
commit
350a4c0c2a
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
  2. 8
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java

2
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) @Transactional(rollbackFor = Exception.class)
@Async @Async
public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) { public void sendReviewFactory(Long signingId, String warehouseName, Long warehouseId) {
String brands = "梦天,欧派,志邦";//可追加 String brands = "梦天,欧派";//可追加 ,志邦
log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId:=" + signingId + "warehouseName:=" + warehouseName + "warehouseId:=" + warehouseId); log.info(">>>>>>>>>>> 签收推送 对象 {}", "signingId:=" + signingId + "warehouseName:=" + warehouseName + "warehouseId:=" + warehouseId);
//查询签收信息 //查询签收信息
DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId); DistributionSignforEntity distributionSignforEntity = distributionSignforMapper.selectById(signingId);

8
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); dto.setOrderPackageCode(orderPackageCode);
upShelfPackageList.add(dto); upShelfPackageList.add(dto);
} }
if(upShelfPackageList.size() > 0){ if(!upShelfPackageList.isEmpty()){
return warehouseUpdownTypeService.downPackage(upShelfPackageList,warehouseId,remark); return warehouseUpdownTypeService.downPackage(upShelfPackageList,warehouseId,remark);
}else{ }else{
return R.fail(403,"处理失败"); return R.fail(403,"处理失败");
@ -66,14 +66,14 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
public R downDeliveryPackage(Map<String,Object> map) { public R downDeliveryPackage(Map<String,Object> map) {
List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>(); List<UpShelfPackageDTO> upShelfPackageList = new ArrayList<>();
String orderPackageCodes = (String) map.get("orderPackageCode"); String orderPackageCodes = (String) map.get("orderPackageCode");
String warehouseId = (String) map.get("warehouseId"); String warehouseId = String.valueOf(map.get("warehouseId"));
String[] split = orderPackageCodes.split(","); String[] split = orderPackageCodes.split(",");
for(String orderPackageCode:split){ for(String orderPackageCode:split){
UpShelfPackageDTO dto = new UpShelfPackageDTO(); UpShelfPackageDTO dto = new UpShelfPackageDTO();
dto.setOrderPackageCode(orderPackageCode); dto.setOrderPackageCode(orderPackageCode);
upShelfPackageList.add(dto); upShelfPackageList.add(dto);
} }
if(upShelfPackageList.size() > 0){ if(!upShelfPackageList.isEmpty()){
return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,Long.parseLong(warehouseId)); return warehouseUpdownTypeService.downDeliveryPackage(upShelfPackageList,Long.parseLong(warehouseId));
}else{ }else{
return R.fail(403,"处理失败"); return R.fail(403,"处理失败");
@ -162,7 +162,7 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
ls.add(dto); ls.add(dto);
} }
if(ls.size() > 0){ if(!ls.isEmpty()){
return warehouseUpdownTypeService.downZeroOrder(ls,warehouseId,remark); return warehouseUpdownTypeService.downZeroOrder(ls,warehouseId,remark);
}else{ }else{
return R.fail(403,"处理失败"); return R.fail(403,"处理失败");

Loading…
Cancel
Save