商城内，保险相关页面

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

@@ -542,8 +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));
-        orderMasterService.insertOrderMaster(orderMaster);
+
-        Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");
 
         // TODO 优惠金额不知道咋算 暂时先给0
         BigDecimal discountMoney = BigDecimal.ZERO;
@@ -554,8 +553,11 @@ public class OrderController extends BaseController {
             InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(appOrderRequest.getInsuranceId());
             if(manager != null){
                 payMoney = payMoney.add(manager.getInsuranceAmount());
+                orderMaster.setInsuranceId(manager.getId());
             }
         }
+        orderMasterService.insertOrderMaster(orderMaster);
+        Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");
 
         // 当实付金额payType<=0时 使payType=BigDecimal.ZERO
         payMoney = BigDecimal.ZERO.max(payMoney);
@@ -1506,6 +1508,13 @@ public class OrderController extends BaseController {
             orderListResponse.setUpdateTime(master.getUpdateTime());
             orderListResponse.setIsCall(master.getIsCall());
             orderListResponse.setConsultMode(master.getConsultMode());
+            orderListResponse.setInsuranceId(master.getInsuranceId());
+            if(master.getInsuranceId() != null){
+                InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(orderMaster.getInsuranceId());
+                if(manager != null){
+                    orderListResponse.setInsuranceManager(manager);
+                }
+            }
             orderListResponses.add(orderListResponse);
 
         }
@@ -1646,6 +1655,13 @@ public class OrderController extends BaseController {
             orderListResponse.setCreateTime(detail.getCreateTime());
             orderListResponse.setUpdateTime(detail.getUpdateTime());
             orderListResponse.setConsultMode(orderMaster.getConsultMode());
+            orderListResponse.setInsuranceId(orderMaster.getInsuranceId());
+            if(orderMaster.getInsuranceId() != null){
+                InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(orderMaster.getInsuranceId());
+                if(manager != null){
+                    orderListResponse.setInsuranceManager(manager);
+                }
+            }
 //            orderListResponse.setAfterServiceRecordList(afterServiceRecordList);
             orderListResponses.add(orderListResponse);
         }

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

@@ -110,6 +110,9 @@ public class OrderDetailController extends BaseController {
     @Resource
     private GoodsCategoryService goodsCategoryService;
 
+    @Resource
+    private IInsuranceManagerService insuranceManagerService;
+
     @RequiresPermissions("order:detail:view")
     @GetMapping()
     public String orderDetail() {
@@ -477,6 +480,13 @@ public class OrderDetailController extends BaseController {
             orderListResponse.setTimeoutFineTimes(detail.getTimeoutFineTimes());
             // TODO: 超时扣费
             orderListResponse.setFinancialChangeRecords(financialChangeRecords);
+            orderListResponse.setInsuranceId(orderMaster.getInsuranceId());
+            if(orderMaster.getInsuranceId() != null){
+                InsuranceManager manager = insuranceManagerService.selectInsuranceManagerById(orderMaster.getInsuranceId());
+                if(manager != null){
+                    orderListResponse.setInsuranceManager(manager);
+                }
+            }
 
             if(!CollectionUtils.isEmpty(financialChangeRecords)){
                 BigDecimal totalAdd = financialChangeRecords.stream().map(FinancialChangeRecord::getChangeMoney).reduce(BigDecimal.ZERO, BigDecimal::add);

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

@@ -0,0 +1,129 @@
+package com.ghy.web.controller.order;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+import com.ghy.common.annotation.Log;
+import com.ghy.common.enums.BusinessType;
+import com.ghy.order.domain.OrderDetailInsuranceUser;
+import com.ghy.order.service.IOrderDetailInsuranceUserService;
+import com.ghy.common.core.controller.BaseController;
+import com.ghy.common.core.domain.AjaxResult;
+import com.ghy.common.utils.poi.ExcelUtil;
+import com.ghy.common.core.page.TableDataInfo;
+
+/**
+ * 订单保险人员Controller
+ *
+ * @author clunt
+ * @date 2024-10-21
+ */
+@Controller
+@RequestMapping("/insurance/user")
+public class OrderDetailInsuranceUserController extends BaseController
+{
+    private String prefix = "insurance/user";
+
+    @Autowired
+    private IOrderDetailInsuranceUserService orderDetailInsuranceUserService;
+
+    @RequiresPermissions("worker:user:view")
+    @GetMapping()
+    public String user()
+    {
+        return prefix + "/user";
+    }
+
+    /**
+     * 查询订单保险人员列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        startPage();
+        List<OrderDetailInsuranceUser> list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * App查询订单保险人员列表
+     */
+    @PostMapping("/app/list")
+    @ResponseBody
+    public TableDataInfo appList(@RequestBody OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        startPage();
+        List<OrderDetailInsuranceUser> list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser);
+        return getDataTable(list);
+    }
+
+
+    /**
+     * 导出订单保险人员列表
+     */
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        List<OrderDetailInsuranceUser> list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser);
+        ExcelUtil<OrderDetailInsuranceUser> util = new ExcelUtil<OrderDetailInsuranceUser>(OrderDetailInsuranceUser.class);
+        return util.exportExcel(list, "订单保险人员数据");
+    }
+
+    /**
+     * 新增订单保险人员
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存订单保险人员
+     */
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(@RequestBody OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        return toAjax(orderDetailInsuranceUserService.insertOrderDetailInsuranceUser(orderDetailInsuranceUser));
+    }
+
+    /**
+     * 修改订单保险人员
+     */
+    @RequiresPermissions("worker:user:edit")
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        OrderDetailInsuranceUser orderDetailInsuranceUser = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserById(id);
+        mmap.put("orderDetailInsuranceUser", orderDetailInsuranceUser);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存订单保险人员
+     */
+    @RequiresPermissions("worker:user:edit")
+    @Log(title = "订单保险人员", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        return toAjax(orderDetailInsuranceUserService.updateOrderDetailInsuranceUser(orderDetailInsuranceUser));
+    }
+
+    /**
+     * 删除订单保险人员
+     */
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(orderDetailInsuranceUserService.deleteOrderDetailInsuranceUserByIds(ids));
+    }
+}

ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ghy.goods.domain.Goods;
 import com.ghy.goods.domain.GoodsArea;
+import com.ghy.goods.domain.InsuranceManager;
 import com.ghy.order.domain.AfterServiceRecord;
 import com.ghy.payment.domain.FinancialChangeRecord;
 import com.ghy.payment.domain.OrderTimeoutRecord;
@@ -168,4 +169,9 @@ public class OrderListResponse {
     private String consultMode;
 
     private Goods goods;
+
+    /*是否有保险id*/
+    private Long insuranceId;
+
+    private InsuranceManager insuranceManager;
 }

ghy-admin/src/main/resources/templates/order/orderManager.html

@@ -988,6 +988,11 @@
         });
     }
 
+    function pcOrderInsurance(orderId) {
+        var url = prefix + '/pcOrderInsurance/' + orderId;
+        $.modal.open("选择保险", url, '800', '300');
+    }
+
     function batchChangePrice() {
         table.set();
         var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId);

ghy-admin/src/main/resources/templates/order/pcOrderInsurance.html

@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('选择保险')" />
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-change-provider">
+        <input name="id"  type="hidden"  th:value="${applyId}" />
+        <div class="form-group">
+            <label class="col-sm-3 control-label">保险：</label>
+            <div class="col-sm-8">
+                <select id="guideUserId" name="guideUserId" class="form-control control-label" required>
+                    <option th:each="guide:${guides}" th:value="${guide.userId}" th:text="${guide.userName}" ></option>
+                </select>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<script type="text/javascript">
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(ctx + "system/apply/changeGuide", $('#form-change-provider').serialize());
+        }
+    }
+</script>
+</body>
+
+</html>

ghy-order/src/main/java/com/ghy/order/domain/OrderDetailInsuranceUser.java

@@ -0,0 +1,39 @@
+package com.ghy.order.domain;
+
+import com.ghy.common.annotation.Excel;
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单保险人员对象 order_detail_insurance_user
+ *
+ * @author clunt
+ * @date 2024-10-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OrderDetailInsuranceUser extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 子单id */
+    @Excel(name = "子单id")
+    private Long orderDetailId;
+
+    /** 姓名 */
+    @Excel(name = "姓名")
+    private String name;
+
+    /** 手机号 */
+    @Excel(name = "手机号")
+    private String phone;
+
+    /** 身份证号码 */
+    @Excel(name = "身份证号码")
+    private String idCardNum;
+
+}

ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java

@@ -216,4 +216,6 @@ public class OrderMaster extends BaseEntity {
 
     private String consultMode;
 
+    private Long insuranceId;
+
 }

ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailInsuranceUserMapper.java

@@ -0,0 +1,61 @@
+package com.ghy.order.mapper;
+
+import java.util.List;
+import com.ghy.order.domain.OrderDetailInsuranceUser;
+
+/**
+ * 订单保险人员Mapper接口
+ *
+ * @author clunt
+ * @date 2024-10-21
+ */
+public interface OrderDetailInsuranceUserMapper
+{
+    /**
+     * 查询订单保险人员
+     *
+     * @param id 订单保险人员主键
+     * @return 订单保险人员
+     */
+    public OrderDetailInsuranceUser selectOrderDetailInsuranceUserById(Long id);
+
+    /**
+     * 查询订单保险人员列表
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 订单保险人员集合
+     */
+    public List<OrderDetailInsuranceUser> selectOrderDetailInsuranceUserList(OrderDetailInsuranceUser orderDetailInsuranceUser);
+
+    /**
+     * 新增订单保险人员
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 结果
+     */
+    public int insertOrderDetailInsuranceUser(OrderDetailInsuranceUser orderDetailInsuranceUser);
+
+    /**
+     * 修改订单保险人员
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 结果
+     */
+    public int updateOrderDetailInsuranceUser(OrderDetailInsuranceUser orderDetailInsuranceUser);
+
+    /**
+     * 删除订单保险人员
+     *
+     * @param id 订单保险人员主键
+     * @return 结果
+     */
+    public int deleteOrderDetailInsuranceUserById(Long id);
+
+    /**
+     * 批量删除订单保险人员
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteOrderDetailInsuranceUserByIds(String[] ids);
+}

ghy-order/src/main/java/com/ghy/order/service/IOrderDetailInsuranceUserService.java

@@ -0,0 +1,60 @@
+package com.ghy.order.service;
+import java.util.List;
+import com.ghy.order.domain.OrderDetailInsuranceUser;
+
+/**
+ * 订单保险人员Service接口
+ *
+ * @author clunt
+ * @date 2024-10-21
+ */
+public interface IOrderDetailInsuranceUserService
+{
+    /**
+     * 查询订单保险人员
+     *
+     * @param id 订单保险人员主键
+     * @return 订单保险人员
+     */
+    public OrderDetailInsuranceUser selectOrderDetailInsuranceUserById(Long id);
+
+    /**
+     * 查询订单保险人员列表
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 订单保险人员集合
+     */
+    public List<OrderDetailInsuranceUser> selectOrderDetailInsuranceUserList(OrderDetailInsuranceUser orderDetailInsuranceUser);
+
+    /**
+     * 新增订单保险人员
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 结果
+     */
+    public int insertOrderDetailInsuranceUser(OrderDetailInsuranceUser orderDetailInsuranceUser);
+
+    /**
+     * 修改订单保险人员
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 结果
+     */
+    public int updateOrderDetailInsuranceUser(OrderDetailInsuranceUser orderDetailInsuranceUser);
+
+    /**
+     * 批量删除订单保险人员
+     *
+     * @param ids 需要删除的订单保险人员主键集合
+     * @return 结果
+     */
+    public int deleteOrderDetailInsuranceUserByIds(String ids);
+
+    /**
+     * 删除订单保险人员信息
+     *
+     * @param id 订单保险人员主键
+     * @return 结果
+     */
+    public int deleteOrderDetailInsuranceUserById(Long id);
+}

ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailInsuranceUserServiceImpl.java

@@ -0,0 +1,98 @@
+package com.ghy.order.service.impl;
+
+import java.util.List;
+import com.ghy.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ghy.order.mapper.OrderDetailInsuranceUserMapper;
+import com.ghy.order.domain.OrderDetailInsuranceUser;
+import com.ghy.order.service.IOrderDetailInsuranceUserService;
+import com.ghy.common.core.text.Convert;
+
+/**
+ * 订单保险人员Service业务层处理
+ *
+ * @author clunt
+ * @date 2024-10-21
+ */
+@Service
+public class OrderDetailInsuranceUserServiceImpl implements IOrderDetailInsuranceUserService
+{
+
+    @Autowired
+    private OrderDetailInsuranceUserMapper orderDetailInsuranceUserMapper;
+
+    /**
+     * 查询订单保险人员
+     *
+     * @param id 订单保险人员主键
+     * @return 订单保险人员
+     */
+    @Override
+    public OrderDetailInsuranceUser selectOrderDetailInsuranceUserById(Long id)
+    {
+        return orderDetailInsuranceUserMapper.selectOrderDetailInsuranceUserById(id);
+    }
+
+    /**
+     * 查询订单保险人员列表
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 订单保险人员
+     */
+    @Override
+    public List<OrderDetailInsuranceUser> selectOrderDetailInsuranceUserList(OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        return orderDetailInsuranceUserMapper.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser);
+    }
+
+    /**
+     * 新增订单保险人员
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 结果
+     */
+    @Override
+    public int insertOrderDetailInsuranceUser(OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        orderDetailInsuranceUser.setCreateTime(DateUtils.getNowDate());
+        return orderDetailInsuranceUserMapper.insertOrderDetailInsuranceUser(orderDetailInsuranceUser);
+    }
+
+    /**
+     * 修改订单保险人员
+     *
+     * @param orderDetailInsuranceUser 订单保险人员
+     * @return 结果
+     */
+    @Override
+    public int updateOrderDetailInsuranceUser(OrderDetailInsuranceUser orderDetailInsuranceUser)
+    {
+        orderDetailInsuranceUser.setUpdateTime(DateUtils.getNowDate());
+        return orderDetailInsuranceUserMapper.updateOrderDetailInsuranceUser(orderDetailInsuranceUser);
+    }
+
+    /**
+     * 批量删除订单保险人员
+     *
+     * @param ids 需要删除的订单保险人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderDetailInsuranceUserByIds(String ids)
+    {
+        return orderDetailInsuranceUserMapper.deleteOrderDetailInsuranceUserByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除订单保险人员信息
+     *
+     * @param id 订单保险人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteOrderDetailInsuranceUserById(Long id)
+    {
+        return orderDetailInsuranceUserMapper.deleteOrderDetailInsuranceUserById(id);
+    }
+}

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

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ghy.order.mapper.OrderDetailInsuranceUserMapper">
+
+    <resultMap type="OrderDetailInsuranceUser" id="OrderDetailInsuranceUserResult">
+        <result property="id"    column="id"    />
+        <result property="orderDetailId"    column="order_detail_id"    />
+        <result property="name"    column="name"    />
+        <result property="phone"    column="phone"    />
+        <result property="idCardNum"    column="id_card_num"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectOrderDetailInsuranceUserVo">
+        select id, order_detail_id, name, phone, id_card_num, create_by, create_time, update_by, update_time, remark from order_detail_insurance_user
+    </sql>
+
+    <select id="selectOrderDetailInsuranceUserList" parameterType="OrderDetailInsuranceUser" resultMap="OrderDetailInsuranceUserResult">
+        <include refid="selectOrderDetailInsuranceUserVo"/>
+        <where>
+            <if test="orderDetailId != null "> and order_detail_id = #{orderDetailId}</if>
+            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="idCardNum != null  and idCardNum != ''"> and id_card_num = #{idCardNum}</if>
+        </where>
+    </select>
+
+    <select id="selectOrderDetailInsuranceUserById" parameterType="Long" resultMap="OrderDetailInsuranceUserResult">
+        <include refid="selectOrderDetailInsuranceUserVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertOrderDetailInsuranceUser" parameterType="OrderDetailInsuranceUser" useGeneratedKeys="true" keyProperty="id">
+        insert into order_detail_insurance_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderDetailId != null">order_detail_id,</if>
+            <if test="name != null">name,</if>
+            <if test="phone != null">phone,</if>
+            <if test="idCardNum != null">id_card_num,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderDetailId != null">#{orderDetailId},</if>
+            <if test="name != null">#{name},</if>
+            <if test="phone != null">#{phone},</if>
+            <if test="idCardNum != null">#{idCardNum},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+        </trim>
+    </insert>
+
+    <update id="updateOrderDetailInsuranceUser" parameterType="OrderDetailInsuranceUser">
+        update order_detail_insurance_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="orderDetailId != null">order_detail_id = #{orderDetailId},</if>
+            <if test="name != null">name = #{name},</if>
+            <if test="phone != null">phone = #{phone},</if>
+            <if test="idCardNum != null">id_card_num = #{idCardNum},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteOrderDetailInsuranceUserById" parameterType="Long">
+        delete from order_detail_insurance_user where id = #{id}
+    </delete>
+
+    <delete id="deleteOrderDetailInsuranceUserByIds" parameterType="String">
+        delete from order_detail_insurance_user where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

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

@@ -14,6 +14,7 @@
         <result property="orderMode"         column="order_mode"/>
         <result property="payMode"         column="pay_mode"/>
         <result property="consultMode"  column="consult_mode"/>
+        <result property="insuranceId"  column="insurance_id"/>
         <result property="isCharge"         column="is_charge"/>
         <result property="isContact"         column="is_contact"/>
         <result property="orderStatus"       column="order_status"/>
@@ -50,6 +51,7 @@
                order_mode,
                pay_mode,
                consult_mode,
+               insurance_id,
                is_charge,
                is_contact,
                order_status,
@@ -105,7 +107,8 @@
                fm.server_money,
                om.goods_brand,
                om.goods_specification,
-               om.consult_mode
+               om.consult_mode,
+               om.insurance_id
         FROM order_master om
         LEFT JOIN customer_address ca ON ca.customer_address_id = om.address_id
         LEFT JOIN goods g ON g.goods_id = om.goods_id
@@ -426,6 +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="orderStatus != null">order_status,</if>
         <if test="payType != null">pay_type,</if>
         <if test="payStatus != null">pay_status,</if>
@@ -449,6 +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="orderStatus != null">#{orderStatus},</if>
         <if test="payType != null">#{payType},</if>
         <if test="payStatus != null">#{payStatus},</if>