From 87e049618e3b5772e15981b00e3580600c70e15c Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Mon, 21 Oct 2024 14:03:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=9F=8E=E5=86=85=EF=BC=8C=E4=BF=9D?= =?UTF-8?q?=E9=99=A9=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/order/OrderController.java | 20 ++- .../order/OrderDetailController.java | 10 ++ .../OrderDetailInsuranceUserController.java | 129 ++++++++++++++++++ .../ghy/web/pojo/vo/OrderListResponse.java | 6 + .../templates/order/orderManager.html | 5 + .../templates/order/pcOrderInsurance.html | 30 ++++ .../domain/OrderDetailInsuranceUser.java | 39 ++++++ .../com/ghy/order/domain/OrderMaster.java | 2 + .../OrderDetailInsuranceUserMapper.java | 61 +++++++++ .../IOrderDetailInsuranceUserService.java | 60 ++++++++ .../OrderDetailInsuranceUserServiceImpl.java | 98 +++++++++++++ .../order/OrderDetailInsuranceUserMapper.xml | 92 +++++++++++++ .../mapper/order/OrderMasterMapper.xml | 7 +- 13 files changed, 556 insertions(+), 3 deletions(-) create mode 100644 ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailInsuranceUserController.java create mode 100644 ghy-admin/src/main/resources/templates/order/pcOrderInsurance.html create mode 100644 ghy-order/src/main/java/com/ghy/order/domain/OrderDetailInsuranceUser.java create mode 100644 ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailInsuranceUserMapper.java create mode 100644 ghy-order/src/main/java/com/ghy/order/service/IOrderDetailInsuranceUserService.java create mode 100644 ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailInsuranceUserServiceImpl.java create mode 100644 ghy-order/src/main/resources/mapper/order/OrderDetailInsuranceUserMapper.xml diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 36d77d99..a429525a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/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); } diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java index ac6e9115..94c5593a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java +++ b/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); 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 new file mode 100644 index 00000000..dc14291d --- /dev/null +++ b/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 list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser); + return getDataTable(list); + } + + /** + * App查询订单保险人员列表 + */ + @PostMapping("/app/list") + @ResponseBody + public TableDataInfo appList(@RequestBody OrderDetailInsuranceUser orderDetailInsuranceUser) + { + startPage(); + List list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser); + return getDataTable(list); + } + + + /** + * 导出订单保险人员列表 + */ + @PostMapping("/export") + @ResponseBody + public AjaxResult export(OrderDetailInsuranceUser orderDetailInsuranceUser) + { + List list = orderDetailInsuranceUserService.selectOrderDetailInsuranceUserList(orderDetailInsuranceUser); + ExcelUtil util = new ExcelUtil(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)); + } +} \ No newline at end of file diff --git a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java b/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java index cb7f7d0b..a77d45d3 100644 --- a/ghy-admin/src/main/java/com/ghy/web/pojo/vo/OrderListResponse.java +++ b/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; } diff --git a/ghy-admin/src/main/resources/templates/order/orderManager.html b/ghy-admin/src/main/resources/templates/order/orderManager.html index e9db747b..14fd6123 100644 --- a/ghy-admin/src/main/resources/templates/order/orderManager.html +++ b/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); diff --git a/ghy-admin/src/main/resources/templates/order/pcOrderInsurance.html b/ghy-admin/src/main/resources/templates/order/pcOrderInsurance.html new file mode 100644 index 00000000..ae6146c0 --- /dev/null +++ b/ghy-admin/src/main/resources/templates/order/pcOrderInsurance.html @@ -0,0 +1,30 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ + + + + diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailInsuranceUser.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderDetailInsuranceUser.java new file mode 100644 index 00000000..df5485e0 --- /dev/null +++ b/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; + +} diff --git a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java b/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java index aaa9e0a1..cb2dde3c 100644 --- a/ghy-order/src/main/java/com/ghy/order/domain/OrderMaster.java +++ b/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; + } diff --git a/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailInsuranceUserMapper.java b/ghy-order/src/main/java/com/ghy/order/mapper/OrderDetailInsuranceUserMapper.java new file mode 100644 index 00000000..b88b3464 --- /dev/null +++ b/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 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); +} diff --git a/ghy-order/src/main/java/com/ghy/order/service/IOrderDetailInsuranceUserService.java b/ghy-order/src/main/java/com/ghy/order/service/IOrderDetailInsuranceUserService.java new file mode 100644 index 00000000..99e7d7fe --- /dev/null +++ b/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 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); +} diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailInsuranceUserServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailInsuranceUserServiceImpl.java new file mode 100644 index 00000000..73dab8c4 --- /dev/null +++ b/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 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); + } +} diff --git a/ghy-order/src/main/resources/mapper/order/OrderDetailInsuranceUserMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderDetailInsuranceUserMapper.xml new file mode 100644 index 00000000..8092bc8a --- /dev/null +++ b/ghy-order/src/main/resources/mapper/order/OrderDetailInsuranceUserMapper.xml @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + select id, order_detail_id, name, phone, id_card_num, create_by, create_time, update_by, update_time, remark from order_detail_insurance_user + + + + + + + + insert into order_detail_insurance_user + + order_detail_id, + name, + phone, + id_card_num, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{orderDetailId}, + #{name}, + #{phone}, + #{idCardNum}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update order_detail_insurance_user + + order_detail_id = #{orderDetailId}, + name = #{name}, + phone = #{phone}, + id_card_num = #{idCardNum}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where id = #{id} + + + + delete from order_detail_insurance_user where id = #{id} + + + + delete from order_detail_insurance_user where id in + + #{id} + + + + \ No newline at end of file diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml index 0968b568..8b2f2989 100644 --- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml +++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml @@ -14,6 +14,7 @@ + @@ -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 @@ order_mode, pay_mode, consult_mode, + insurance_id, order_status, pay_type, pay_status, @@ -449,6 +453,7 @@ #{orderMode}, #{payMode}, #{consultMode}, + #{consultMode}, #{orderStatus}, #{payType}, #{payStatus},