diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java index b40a46dd..f33c2c3b 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java @@ -1485,7 +1485,9 @@ public class OrderMasterController extends BaseController { if(orderMaster.getOrderStatus() != null && OrderStatus.PLAIN.code() == orderMaster.getOrderStatus()){ OrderMaster model = orderMasterService.selectById(orderMaster.getId()); try { - insuranceService.orderInsurance(model.getCode()); + if(model.getInsuranceId()!=null){ + insuranceService.orderInsurance(model.getCode()); + } }catch (Exception e){ logger.error("下单报错:" + ExceptionUtils.getMessage(e)); return AjaxResult.error("保险正生成中,可能需几秒或几分钟,请稍等即可!若超半小时可联系发单方或平台!"); @@ -1506,7 +1508,7 @@ public class OrderMasterController extends BaseController { orderDetailService.updateOrderDetail(orderDetail); }); } - return AjaxResult.success(""); + return AjaxResult.success(); } catch (Exception e) { e.printStackTrace(); logger.error("派单失败:" + ExceptionUtils.getMessage(e)); diff --git a/ghy-admin/src/main/resources/application-druid.yml b/ghy-admin/src/main/resources/application-druid.yml index 5cb2c87d..c51ff535 100644 --- a/ghy-admin/src/main/resources/application-druid.yml +++ b/ghy-admin/src/main/resources/application-druid.yml @@ -45,9 +45,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://58.49.150.163:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 + url: jdbc:mysql://8.138.169.236:3306/gqz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 username: root - password: Clunt@12345 + password: clunt@12345 # 从库数据源 slave: # 从数据源开关/默认关闭