From b70c95e87d62e737db54285cf572b19da8d3186f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Mon, 9 Sep 2024 15:08:48 +0800 Subject: [PATCH] =?UTF-8?q?feature:stream=E6=B5=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bespoke/service/impl/SkOrderServiceImpl.java | 4 ++-- .../bespoke/service/impl/YyOrderServiceImpl.java | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java index d62cd6d..e27fd9c 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/SkOrderServiceImpl.java @@ -180,8 +180,8 @@ public class SkOrderServiceImpl implements OrderService { try { if (locked){ List skOrderItemInfoList = skOrderItemInfoMapper.queryOrderItemInfo(skOrderInfo.getId()); - boolean fpresent = skOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringLessZero(item.getHsje())).findFirst().isPresent(); - boolean zpresent = skOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringMoreZero(item.getHsje())).findFirst().isPresent(); + boolean fpresent = skOrderItemInfoList.stream().anyMatch(item->DecimalCalculateUtil.stringLessZero(item.getHsje())); + boolean zpresent = skOrderItemInfoList.stream().anyMatch(item->DecimalCalculateUtil.stringMoreZero(item.getHsje())); if (fpresent && zpresent && skOrderItemInfoList.size() > ConfigureConstant.INT_2){ backMessage.add(String.format(message, skOrderInfo.getXsddm(), "负数行订单明细不能超过两行")); continue; diff --git a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java index 5745fb4..f2d0c70 100644 --- a/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java +++ b/order-management-order/src/main/java/com/dxhy/order/consumer/modules/bespoke/service/impl/YyOrderServiceImpl.java @@ -6,13 +6,10 @@ import com.dxhy.base.common.constant.OrderManagementConstant; import com.dxhy.base.common.model.OrderInfo; import com.dxhy.base.common.model.R; import com.dxhy.base.common.utils.DecimalCalculateUtil; -import com.dxhy.base.service.module.buyer.model.BuyerEntity; -import com.dxhy.base.service.module.buyer.service.BuyerService; import com.dxhy.base.service.module.thirdservice.simsback.model.TaxEquipmentInfo; import com.dxhy.base.service.module.thirdservice.simsback.service.SimsBackService; import com.dxhy.base.service.module.thirdservice.user.model.DeptEntity; import com.dxhy.base.service.module.thirdservice.user.service.UserInfoService; -import com.dxhy.base.service.openapi.protocol.qd.PageGfxxReq; import com.dxhy.base.thirdservice.module.base.service.BaseService; import com.dxhy.base.thirdservice.module.thirdservice.redis.service.RedissonService; import com.dxhy.management.common.constant.ConfigureConstant; @@ -29,7 +26,6 @@ import com.dxhy.order.consumer.modules.bespoke.config.FildConfig; import com.dxhy.order.consumer.modules.bespoke.config.datasource.config.DynamicContextHolder; import com.dxhy.order.consumer.modules.bespoke.model.req.FileModel; import com.dxhy.order.consumer.modules.bespoke.model.req.ReqParam; -import com.dxhy.order.consumer.modules.bespoke.model.sk.SkOrderItemInfo; import com.dxhy.order.consumer.modules.bespoke.model.yy.InvoiceBpmmap; import com.dxhy.order.consumer.modules.bespoke.model.yy.NewTable; import com.dxhy.order.consumer.modules.bespoke.model.yy.YyOrderInfo; @@ -50,6 +46,7 @@ import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; @@ -81,8 +78,6 @@ public class YyOrderServiceImpl implements OrderService { @Resource private AllocateInvoiceInterfaceServiceV3 allocateInvoiceInterfaceServiceImplV3; - @Resource - private BuyerService buyerService; @Resource private SimsBackService simsBackService; @@ -185,8 +180,8 @@ public class YyOrderServiceImpl implements OrderService { try { if (locked){ List yyOrderItemInfoList = yyOrderItemInfoMapper.queryOrderItemInfo(yyOrderInfo.getId()); - boolean fpresent = yyOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringLessZero(item.getIsum())).findFirst().isPresent(); - boolean zpresent = yyOrderItemInfoList.stream().filter(item -> DecimalCalculateUtil.stringMoreZero(item.getIsum())).findFirst().isPresent(); + boolean fpresent = yyOrderItemInfoList.stream().anyMatch(item->DecimalCalculateUtil.stringLessZero(item.getIsum())); + boolean zpresent = yyOrderItemInfoList.stream().anyMatch(item->DecimalCalculateUtil.stringMoreZero(item.getIsum())); if (fpresent && zpresent && yyOrderItemInfoList.size() > ConfigureConstant.INT_2){ backMessage.add(String.format(message, yyOrderInfo.getCdlcode(), "负数行订单明细不能超过两行")); continue;