From b084fbe10aca522f7a144931a69b5ed802be7a4f Mon Sep 17 00:00:00 2001 From: gaorl Date: Tue, 27 Jun 2023 19:03:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature=EF=BC=9A=E6=98=8E=E7=BB=86=E5=90=88?= =?UTF-8?q?=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/OrderInfoServiceImpl.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 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 04a0a3cf..241b1375 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 @@ -2120,15 +2120,14 @@ public class OrderInfoServiceImpl implements OrderInfoService { if("1".equals(orderInfo.getQdBz())&&orderItemInfos.size() - deleteItem.size() < 8 ){ orderInfoNew.setQdBz("0"); } - if(diffJe.compareTo(BigDecimal.ZERO) != 0){ - String bhsje = new BigDecimal(orderInfo.getKphjje()).subtract(se).toString(); - orderInfoNew.setHjbhsje(bhsje); - orderInfoNew.setHjse(se.toString()); - orderProcessInfoNew.setHjbhsje(bhsje); - orderProcessInfoNew.setKpse(se.toString()); - orderMapper.updateOrderInfoByOrderId(orderInfoNew,Arrays.asList(orderInfo.getNsrsbh())); - orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfoNew,Arrays.asList(orderInfo.getNsrsbh())); - } + String bhsje = new BigDecimal(orderInfo.getKphjje()).subtract(se).toString(); + orderInfoNew.setHjbhsje(bhsje); + orderInfoNew.setHjse(se.toString()); + orderProcessInfoNew.setHjbhsje(bhsje); + orderProcessInfoNew.setKpse(se.toString()); + orderMapper.updateOrderInfoByOrderId(orderInfoNew,Arrays.asList(orderInfo.getNsrsbh())); + orderProcessInfoMapper.updateOrderProcessInfoByProcessId(orderProcessInfoNew,Arrays.asList(orderInfo.getNsrsbh())); + return R.ok(); } From 2b28a29b15f4db117173d99cf260db94a6027d8d Mon Sep 17 00:00:00 2001 From: gaorl Date: Wed, 28 Jun 2023 08:19:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature=EF=BC=9A=E5=90=8C=E6=AD=A5=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E5=BA=93=EF=BC=8C=E6=97=A0=E8=87=AA=E8=A1=8C=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=97=B6=EF=BC=8C=E7=94=9F=E6=88=90=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/service/impl/OrderInfoServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 241b1375..a570a239 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 @@ -1925,7 +1925,9 @@ public class OrderInfoServiceImpl implements OrderInfoService { OrderItemInfo item = new OrderItemInfo(); item.setId(itemInfo.getId()); item.setZnfm(ConfigureConstant.STRING_0); - item.setZxbm(StringUtils.isNotBlank(itemInfo.getZxbm())?itemInfo.getZxbm():baseService.getGenerateShotKey()); + if (StringUtils.isBlank(itemInfo.getZxbm())) { + item.setZxbm(itemInfo.getZxbm()); + } items.add(item); continue; } @@ -1956,7 +1958,7 @@ public class OrderInfoServiceImpl implements OrderInfoService { item.setId(itemInfo.getId()); item.setZnfm(ConfigureConstant.STRING_0); if (StringUtils.isBlank(itemInfo.getZxbm())) { - item.setZxbm(commodityCodeEntity.getZxbm()); + item.setZxbm(itemInfo.getZxbm()); } items.add(item); }