diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailInsuranceUserController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailInsuranceUserController.java
index 442e0788..e3e1e0da 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailInsuranceUserController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailInsuranceUserController.java
@@ -110,16 +110,17 @@ public class OrderDetailInsuranceUserController extends BaseController
             aliCloudService.certNoTwoElementVerification(req);
         } catch (Exception e) {
             log.error("身份证二要素校验失败:{}", e.getMessage(), e);
-            return AjaxResult.error(e.getMessage(), "身份证二要素校验失败!");
+            return AjaxResult.error("请核对姓名与身份证号！");
         }
         // 将保险人员增员到原保险订单上去
         try {
             insuranceService.editInsurance(orderDetailInsuranceUser);
+            orderDetailInsuranceUserService.insertOrderDetailInsuranceUser(orderDetailInsuranceUser);
+            return AjaxResult.success("增员完毕，保险已生效。");
         }catch (Exception e){
             log.error("保险增员失败:{}", e.getMessage(), e);
-            return AjaxResult.error(e.getMessage(), "保险增员失败!");
+            return AjaxResult.error("保险正生成中，可能需几秒或几分钟，请稍等即可！若超半小时可联系发单方或平台。");
         }
-        return toAjax(orderDetailInsuranceUserService.insertOrderDetailInsuranceUser(orderDetailInsuranceUser));
     }
 
     /**
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 f018967f..b40a46dd 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
@@ -1481,13 +1481,6 @@ public class OrderMasterController extends BaseController {
     public AjaxResult editOrderMaster(@RequestBody OrderMaster orderMaster) {
         try {
             int result = orderMasterService.updateOrderMaster(orderMaster);
-            if (result > 0) {
-                List<OrderDetail> orderDetails = orderDetailService.selectByOrderMasterId(orderMaster.getId());
-                orderDetails.forEach(orderDetail -> {
-                    orderDetail.setOrderStatus(orderMaster.getOrderStatus());
-                    orderDetailService.updateOrderDetail(orderDetail);
-                });
-            }
             // 下单
             if(orderMaster.getOrderStatus() != null && OrderStatus.PLAIN.code() == orderMaster.getOrderStatus()){
                 OrderMaster model = orderMasterService.selectById(orderMaster.getId());
@@ -1495,16 +1488,24 @@ public class OrderMasterController extends BaseController {
                     insuranceService.orderInsurance(model.getCode());
                 }catch (Exception e){
                     logger.error("下单报错:" + ExceptionUtils.getMessage(e));
+                    return AjaxResult.error("保险正生成中，可能需几秒或几分钟，请稍等即可！若超半小时可联系发单方或平台!");
                 }
                 // 判断是否是在线支付订单--如果是在线支付,且未付款,则需要提示支付后接单
                 if(PayTypeEnum.WX_LITE.getCode().equals(model.getPayType())){
                     // 查询财务信息
                     FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(model.getId());
                     if(!PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())){
-                        return AjaxResult.error("待支付后再接单!");
+                        return AjaxResult.error("客户支付中，请稍后！待支付完成可接单!");
                     }
                 }
             }
+            if (result > 0) {
+                List<OrderDetail> orderDetails = orderDetailService.selectByOrderMasterId(orderMaster.getId());
+                orderDetails.forEach(orderDetail -> {
+                    orderDetail.setOrderStatus(orderMaster.getOrderStatus());
+                    orderDetailService.updateOrderDetail(orderDetail);
+                });
+            }
             return AjaxResult.success("");
         } catch (Exception e) {
             e.printStackTrace();