Commit 7eaa7398 by fanjiaxin

联调问题处理

parent 76976079
Pipeline #71629 passed with stages
in 56 seconds
...@@ -315,7 +315,8 @@ public class DrmSharerConfig { ...@@ -315,7 +315,8 @@ public class DrmSharerConfig {
Optional<CommissionSharerProductBO> sharerProductCommissionOpt = Optional.ofNullable(commissionSharerProductList) Optional<CommissionSharerProductBO> sharerProductCommissionOpt = Optional.ofNullable(commissionSharerProductList)
.orElseGet(ArrayList::new) .orElseGet(ArrayList::new)
.stream() .stream()
.filter(Objects::nonNull) .filter(item -> StringUtils.isNotBlank(item.getOpenId()))
.filter(item -> StringUtils.isNotBlank(item.getProductId()))
.filter(item -> item.getOpenId().equals(openId)) .filter(item -> item.getOpenId().equals(openId))
.filter(item -> null == productId || item.getProductId().equals(String.valueOf(productId))) .filter(item -> null == productId || item.getProductId().equals(String.valueOf(productId)))
.findFirst(); .findFirst();
...@@ -333,7 +334,7 @@ public class DrmSharerConfig { ...@@ -333,7 +334,7 @@ public class DrmSharerConfig {
Optional<CommissionSharerBO> sharerCommissionOpt = Optional.ofNullable(commissionSharerList) Optional<CommissionSharerBO> sharerCommissionOpt = Optional.ofNullable(commissionSharerList)
.orElseGet(ArrayList::new) .orElseGet(ArrayList::new)
.stream() .stream()
.filter(Objects::nonNull) .filter(item -> StringUtils.isNotBlank(item.getOpenId()))
.filter(item -> item.getOpenId().equals(openId)) .filter(item -> item.getOpenId().equals(openId))
.findFirst(); .findFirst();
if (sharerCommissionOpt.isPresent()) { if (sharerCommissionOpt.isPresent()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment