From 503529d3ac0d703e024a5143ef5b762ec496baf9 Mon Sep 17 00:00:00 2001 From: gaorl Date: Mon, 15 May 2023 10:51:42 +0800 Subject: [PATCH] =?UTF-8?q?feature=EF=BC=9A=E6=9B=B4=E6=96=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86=E7=89=A9=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java index b578020d..db362dd5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java @@ -1810,7 +1810,8 @@ public class OrderInfoServiceImpl implements OrderInfoService { //根据订单id查询明细数据 List orderItemInfos = orderItemInfoMapper.selectAllByOrderId(Arrays.asList(orderInfoId), null); List orderItemInfoList = new ArrayList<>(); - Boolean oilMark = true; + Boolean oilMark = false; + int i = 0; for (OrderItemInfo orderItemInfo : orderItemInfos) { // if(StringUtils.isNotBlank(orderItemInfo.getSpbm())){ // continue; @@ -1828,13 +1829,13 @@ public class OrderInfoServiceImpl implements OrderInfoService { orderItemInfo.setZnfm(ConfigureConstant.STRING_0); orderItemInfo.setXmsl(null); orderItemInfo.setXmdj(null); - if(StringUtils.isBlank(commodityCodeEntity.getCpy())|| "N".equals(commodityCodeEntity.getCpy())){ - oilMark = false; + if(StringUtils.isNotBlank(commodityCodeEntity.getCpy()) && "Y".equals(commodityCodeEntity.getCpy())){ + i++; } } orderItemInfoList.add(orderItemInfo); } - if(oilMark){ + if(orderItemInfoList.size()==i){ //更新order_info 清单标志为4 OrderInfo orderInfo = new OrderInfo(); orderInfo.setId(orderInfoId);