fix bug

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java

@@ -542,6 +542,7 @@ public class OrderController extends BaseController {
         orderMaster.setRemark(appOrderRequest.getRemark());
         orderMaster.setExpectTimeStart(DateUtils.parseDate(appOrderRequest.getExpectTimeStart(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
         orderMaster.setExpectTimeEnd(DateUtils.parseDate(appOrderRequest.getExpectTimeEnd(), com.ghy.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS));
+        orderMaster.setInsuranceId(appOrderRequest.getInsuranceId());
 
 
         // TODO 优惠金额不知道咋算 暂时先给0

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java

@@ -704,6 +704,13 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setDrawCashStatus(detail.getDrawCashStatus());
             orderListResponse.setArrivalTime(detail.getArrivalTime());
             orderListResponse.setConsultMode(orderMaster.getConsultMode());
+            orderListResponse.setInsuranceId(orderMaster.getInsuranceId());
+            if(orderMaster.getInsuranceId() != null){
+                InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(orderMaster.getInsuranceId());
+                if(manager != null){
+                    orderListResponse.setInsuranceManager(manager);
+                }
+            }
             orderListResponses.add(orderListResponse);
         });
         return voDataTable(orderListResponses, list);

ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java

@@ -1390,7 +1390,7 @@ public class OrderMasterController extends BaseController {
             return AjaxResult.success("");
         } catch (Exception e) {
             e.printStackTrace();
-            return AjaxResult.error("");
+            return AjaxResult.error(e.getMessage());
         }
     }
 

ghy-admin/src/main/java/com/ghy/web/service/InsuranceService.java

@@ -2,7 +2,7 @@ package com.ghy.web.service;
 
 public interface InsuranceService {
 
-    public void orderInsurance(String orderCode);
+    public void orderInsurance(String orderCode) throws Exception;
 
 
 

ghy-admin/src/main/java/com/ghy/web/service/impl/InsuranceServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.ghy.common.utils.security.Md5Utils;
 import com.ghy.customer.domain.CustomerAddress;
 import com.ghy.customer.service.CustomerAddressService;
@@ -38,7 +39,7 @@ public class InsuranceServiceImpl implements InsuranceService {
     private IWorkerCertificationService workerCertificationService;
 
     @Override
-    public void orderInsurance(String orderCode) {
+    public void orderInsurance(String orderCode) throws Exception{
         InsuranceOrderReq req = new InsuranceOrderReq();
         OrderMaster master = orderMasterService.selectByCode(orderCode);
         req.setOrderNumber(master.getCode());
@@ -57,5 +58,8 @@ public class InsuranceServiceImpl implements InsuranceService {
         log.info("调用保险请求url:{},内容:{}", baseUrl+"/platInterface/order", JSONUtil.toJsonStr(req));
         String result = HttpUtil.post(baseUrl+"/platInterface/order", JSONUtil.toJsonStr(req));
         log.info("调用保险返回内容:{}", result);
+        if(!"1".equals(JSONObject.parseObject(result).getString("code"))){
+            throw new Exception(JSONObject.parseObject(result).getString("msg"));
+        }
     }
 }

ghy-framework/src/main/java/com/ghy/framework/config/ShiroConfig.java

@@ -293,6 +293,8 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/order/operate/app/**", "anon");
         filterChainDefinitionMap.put("/warn/record/app/**", "anon");
         filterChainDefinitionMap.put("/customer/selection/app/**", "anon");
+        filterChainDefinitionMap.put("/insurance/user/app/**", "anon");
+        filterChainDefinitionMap.put("/insurance/user/**", "anon");
         filterChainDefinitionMap.put("/jim/**", "anon");
         filterChainDefinitionMap.put("/MP_verify_bRFuvYpyQ4WLr0on.txt", "anon");
         // 对静态资源设置匿名访问

ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml

@@ -429,7 +429,7 @@
         <if test="orderMode != null">order_mode,</if>
         <if test="payMode != null">pay_mode,</if>
         <if test="consultMode != null">consult_mode,</if>
-        <if test="insurance_id != null">insurance_id,</if>
+        <if test="insuranceId != null">insurance_id,</if>
         <if test="orderStatus != null">order_status,</if>
         <if test="payType != null">pay_type,</if>
         <if test="payStatus != null">pay_status,</if>
@@ -453,7 +453,7 @@
         <if test="orderMode != null">#{orderMode},</if>
         <if test="payMode != null">#{payMode},</if>
         <if test="consultMode != null">#{consultMode},</if>
-        <if test="insurance_id != null">#{consultMode},</if>
+        <if test="insuranceId != null">#{consultMode},</if>
         <if test="orderStatus != null">#{orderStatus},</if>
         <if test="payType != null">#{payType},</if>
         <if test="payStatus != null">#{payStatus},</if>