From aa0ad76fe64a8b9a815c7c22cab5687dbb0fdc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Fri, 8 Sep 2023 13:44:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java | 2 +- .../modules/order/controller/OrderInfoController.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java index 843b2af1..e5a74e8c 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/dao/OrderProcessInfoMapper.java @@ -51,7 +51,7 @@ public interface OrderProcessInfoMapper { */ OrderProcessInfo queryOrderProcessInfoByFpqqlsh(@Param("fpqqlsh") String fpqqlsh, @Param("shList") List shList); - List queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh,String zfbz, @Param("shList")List shList); + List queryOrderProcessInfoByBzdh(@Param("bzdh") String bzdh,@Param("zfbz") String zfbz, @Param("shList")List shList); List queryOrderProcessInfoByBzdhs(@Param("bzdhs") List bzdhs, @Param("shList")List shList); diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java index 80030cfb..b77016ff 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderInfoController.java @@ -178,8 +178,11 @@ public class OrderInfoController { return R.ok(); } catch (Exception e) { + if(e instanceof OrderReceiveException){ + return R.error(e.getMessage()); + } log.error(e.getMessage()); - return R.error(e.getMessage()); + return R.error(OrderInfoContentEnum.INTERNAL_SERVER_ERROR); } } From a33b52491123f93ee0c78d6ca02c540023929f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E8=8D=A3=E7=90=B3?= Date: Fri, 8 Sep 2023 14:11:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature:=E8=A1=A5=E5=BD=95=E6=8A=A5?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/OrderProcessInfoMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml index 64f2cf23..b8718a88 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml @@ -149,7 +149,7 @@ op.* FROM order_process_info op - inner join order_invoice_info oii on oii.order_info_id = op.order_info_id + left join order_invoice_info oii on oii.order_info_id = op.order_info_id WHERE op.bzdh = #{bzdh,jdbcType=VARCHAR}