From 60e06d2ec977260b1ede3f75282ffe33af63cf3a Mon Sep 17 00:00:00 2001 From: liufeilong Date: Mon, 24 Apr 2023 18:27:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E6=88=90=E5=93=81?= =?UTF-8?q?=E6=B2=B9=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/controller/OrderSplitController.java | 5 ++--- .../modules/order/service/impl/OrderSplitServiceImpl.java | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java index 7cb3f306..65bec3ed 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java @@ -89,7 +89,7 @@ public class OrderSplitController { return R.ok().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage()); } catch (Exception e) { log.error("{}订单拆分接口异常，异常信息:{}", LOGGER_MSG, e); - return R.error(); + return R.error(e.getMessage()); } } @@ -248,7 +248,6 @@ public class OrderSplitController { @SysLog(operation = "保存拆分订单rest接口", operationDesc = "对订单进行拆分后数据保存", key = "订单拆分") public R saveOrderInfo( @ApiParam(name = "orderInfo", value = "拆分订单的全信息") @RequestBody List commonList) { - log.info("{}页面订单信息录入的接口，commonOrder:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList)); try { log.info("{}页面订单信息录入的接口，前端传入的参数commonList:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(commonList)); orderSplitService.splitOrder(commonList); @@ -259,7 +258,7 @@ public class OrderSplitController { return R.error().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage()); } catch (Exception e) { return R.error().put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey()) - .put(OrderManagementConstant.MESSAGE, OrderInfoContentEnum.RECEIVE_FAILD.getMessage()); + .put(OrderManagementConstant.MESSAGE, e.getMessage()); } } diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java index 83e36f74..29e803c5 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderSplitServiceImpl.java @@ -329,10 +329,7 @@ public class OrderSplitServiceImpl implements OrderSplitService { continue; } - //购方是否为空、税编是否为空校验、成品油校验 - if(StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfNsrsbh()) || StrUtil.isBlank(commonOrderInfo.getOrderInfo().getGhfMc()) ){ - throw new Exception("购方信息为空,请补全!"); - } + //税编是否为空校验、成品油校验 String cpy = ""; for(OrderItemInfo orderItemInfo: commonOrderInfo.getOrderItemInfo()){ if(StrUtil.isBlank(orderItemInfo.getSpbm())){