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 66d93fea..27943233 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 @@ -1500,18 +1500,20 @@ public class OrderInfoServiceImpl implements OrderInfoService { .put(OrderManagementConstant.MESSAGE, excuSingle.get(OrderManagementConstant.MESSAGE)); } //负数订单保存后,删除SAP传过来的结算单 - log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单"); - if(ConfigureConstant.STRING_1.equals(op.getOrderStatus())){ - log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单,已经是删除状态"); - }else { - OrderProcessInfo updateOp = new OrderProcessInfo(); - updateOp.setId(op.getId()); - updateOp.setOrderStatus(ConfigureConstant.STRING_1); - int i = orderProcessInfoMapper.updateOrderProcessInfoByProcessId(updateOp, null); - if(i == 0){ - log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单失败"); + if(ObjectUtil.isNotNull(op)){ + log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单"); + if(ConfigureConstant.STRING_1.equals(op.getOrderStatus())){ + log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单,已经是删除状态"); }else { - log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单成功"); + OrderProcessInfo updateOp = new OrderProcessInfo(); + updateOp.setId(op.getId()); + updateOp.setOrderStatus(ConfigureConstant.STRING_1); + int i = orderProcessInfoMapper.updateOrderProcessInfoByProcessId(updateOp, null); + if(i == 0){ + log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单失败"); + }else { + log.debug("{}订单保存后,根据填写的报账单号删除SAP传过来的结算单成功"); + } } } Map sldMap = new HashMap<>(2);