From f27bd5c18b64931b88af37dadde8d3bd1d54a20f Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 5 Jun 2023 19:30:53 +0800 Subject: [PATCH] =?UTF-8?q?feature=201.=E4=BF=AE=E5=A4=8D=E7=BA=A2?= =?UTF-8?q?=E7=A5=A8=E6=B8=85=E5=8D=95=E6=A0=87=E5=BF=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GenerateReadyOpenOrderServiceImpl.java | 27 ++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java index 4d941b1d..e498084a 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/GenerateReadyOpenOrderServiceImpl.java @@ -33,6 +33,7 @@ import com.dxhy.order.model.*; import com.dxhy.order.utils.CommonUtils; import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.utils.NsrsbhUtils; +import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -293,7 +294,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder // 补全明细信息 List orderItemList = commonOrderInfo.getOrderItemInfo(); - boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); + boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> StringUtils.isNotBlank(orderItemInfo.getSpbm()) && baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); if(kcp){ orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey()); if(orderItemList.size() > ConfigureConstant.INT_8){ @@ -314,6 +315,7 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder } + /** * 生成待开具订单 */ @@ -878,6 +880,29 @@ public class GenerateReadyOpenOrderServiceImpl implements GenerateReadyOpenOrder } public static void main(String[] args) { + List list = Lists.newArrayList(); + list.add("1"); + list.add("2"); + list.add("3"); + list.add("4"); + String collect = list.stream().collect(Collectors.joining(",")); +// boolean kcp = orderItemList.stream().allMatch(orderItemInfo -> baseServiceConfig.getKcpspbm().contains(orderItemInfo.getSpbm())); +// if(kcp){ +// orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_7.getKey()); +// if(orderItemList.size() > ConfigureConstant.INT_8){ +// orderInfo.setQdBz(OrderInfoEnum.QDBZ_CODE_8.getKey()); +// } +// } + + String str1 = ""; + boolean b = list.stream().allMatch(l -> StringUtils.isNotBlank(str1) && collect.contains(str1)); + if(b){ + System.out.println("98458845"); + }else { + System.out.println("134567890"); + } + + String str = "差额征税：5000.00。aaaaa"; int indexOf = str.indexOf(ConfigureConstant.STRING_CEZS); int indexOf2 = str.indexOf("。");