Merge remote-tracking branch 'origin/task_4631_wq' into test

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/OrderSplitController.java

@@ -93,6 +93,9 @@ public class OrderSplitController {
         } catch (OrderReceiveException e) {
             log.warn("{}订单拆分接口保存失败：{}", LOGGER_MSG, e);
             return R.ok().put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage());
+        } catch (RuntimeException e) {
+            log.error("{}订单拆分接口异常，异常信息:{}", LOGGER_MSG, e);
+            return R.error(e.getMessage());
         } catch (Exception e) {
             log.error("{}订单拆分接口异常，异常信息:{}", LOGGER_MSG, e);
             return R.error(e.getMessage());
@@ -177,7 +180,12 @@ public class OrderSplitController {
             log.error("{}订单多金额拆分异常:{}", LOGGER_MSG, e);
             vo.put(OrderManagementConstant.CODE, e.getCode()).put(OrderManagementConstant.MESSAGE, e.getMessage());
             return vo;
-        } catch (Exception e) {
+        }catch (RuntimeException e) {
+            log.error("{}订单拆分异常：{}", LOGGER_MSG, e);
+            vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey());
+            vo.put(OrderManagementConstant.MESSAGE, e.getMessage());
+            return vo;
+        }catch (Exception e) {
             log.error("{}订单拆分异常：{}", LOGGER_MSG, e);
             vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey());
             vo.put(OrderManagementConstant.MESSAGE, OrderInfoContentEnum.RECEIVE_FAILD.getMessage());
@@ -229,6 +237,11 @@ public class OrderSplitController {
             vo.put(OrderManagementConstant.CODE, e.getCode());
             vo.put(OrderManagementConstant.MESSAGE, e.getMessage());
             return vo;
+        } catch (RuntimeException e) {
+            log.error("{}订单拆分异常：{}", LOGGER_MSG, e);
+            vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey());
+            vo.put(OrderManagementConstant.MESSAGE, e.getMessage());
+            return vo;
         } catch (Exception e) {
             log.error("{}订单拆分异常：{}", LOGGER_MSG, e);
             vo.put(OrderManagementConstant.CODE, OrderInfoContentEnum.RECEIVE_FAILD.getKey());