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); } }