diff --git a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index 8275ba88..b77c00f1 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java @@ -128,8 +128,6 @@ public class PortalOfCostController { return R.error("支付异常"); } - - /** * 一站式创建费用(费用申请,根据东哥的数据关联政策生成) * @param createBo diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index e2a50eff..fa3a6e43 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -254,7 +254,7 @@ public class PortalOfCostApplication { List invCodes = new ArrayList<>(); if(CollectionUtil.isNotEmpty(createBo.getGoodsList())){ invCodes = createBo.getGoodsList().stream() - .map(ProcessGoodsItem::getInventoryCode).distinct().collect(Collectors.toList());; + .map(ProcessGoodsItem::getInventoryCode).distinct().collect(Collectors.toList()); } List skuList = this.initSkuListOfProcess(invCodes); //常用参数 @@ -623,8 +623,8 @@ public class PortalOfCostApplication { if(skuList.size()!=invCodeList.size()){ Set missCodes = new HashSet<>(); for (String code : invCodeList) { - boolean noneMatch = skuList.stream().noneMatch(a->a.getSkuCode().equals(code)); - if(noneMatch){ + boolean anyMatch = skuList.stream().anyMatch(a->a.getSkuCode().equals(code)); + if(!anyMatch){ missCodes.add(code); } } @@ -1116,6 +1116,7 @@ public class PortalOfCostApplication { if(CollectionUtil.isNotEmpty(invCodes)){ LambdaQueryWrapper skuLqw = new LambdaQueryWrapper<>(); skuLqw.in(GoodsSku::getSkuCode,invCodes); + skuLqw.eq(GoodsSku::getEnable,1); goodsSkus = goodsSkuService.list(skuLqw); if(invCodes.size()!=goodsSkus.size()){ List skuCodeNotExistList = new ArrayList<>(); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index c2b362de..b77e92ed 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java @@ -114,7 +114,7 @@ public class VtbVerificationApplication { tbsTask.task1(); } } catch (BeansException e) { - e.printStackTrace(); + //e.printStackTrace(); } return r; }else if (result.getStatus()==500){