diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java index d0dd342..f6ad32d 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderInfoController.java @@ -112,7 +112,7 @@ public class OrderInfoController extends BaseController @RequiresPermissions("order:info:add") @Log(title = "订单信息", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody OrderInfo orderInfo) + public AjaxResult add(@RequestBody OrderInfoVo orderInfo) { return toAjax(orderInfoService.insertOrderInfo(orderInfo)); } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java index 24b06ae..99dc318 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderInfoMapper.java @@ -34,7 +34,9 @@ public interface OrderInfoMapper * @param orderInfo 订单信息 * @return 结果 */ - public int insertOrderInfo(OrderInfo orderInfo); + public int insertOrderInfo(OrderInfoVo orderInfo); + + public int insertOrderDetails(OrderInfoVo orderInfo); /** * 修改订单信息 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java index 6183739..ff0636b 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderInfoService.java @@ -34,7 +34,7 @@ public interface IOrderInfoService * @param orderInfo 订单信息 * @return 结果 */ - public int insertOrderInfo(OrderInfo orderInfo); + public int insertOrderInfo(OrderInfoVo orderInfo); /** * 修改订单信息 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java index ff9b531..9ec9027 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderInfoServiceImpl.java @@ -3,6 +3,9 @@ package com.bonus.zlpt.order.service.impl; import java.util.List; import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo; +import com.bonus.zlpt.common.security.utils.SecurityUtils; +import com.bonus.zlpt.order.mapper.OrderDetailsMapper; +import com.bonus.zlpt.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.zlpt.order.mapper.OrderInfoMapper; @@ -52,9 +55,15 @@ public class OrderInfoServiceImpl implements IOrderInfoService * @return 结果 */ @Override - public int insertOrderInfo(OrderInfo orderInfo) + public int insertOrderInfo(OrderInfoVo orderInfo) { - return orderInfoMapper.insertOrderInfo(orderInfo); + LoginUser user = SecurityUtils.getLoginUser(); + orderInfo.setOrderUser(user.getUserid()); + orderInfoMapper.insertOrderInfo(orderInfo); + Long orderId = orderInfo.getOrderId(); + System.out.println("xxxx" + orderId); + orderInfo.setOrderId(orderId); + return orderInfoMapper.insertOrderDetails(orderInfo); } /** diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml index f37957e..3ed7f15 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where o.order_id = #{orderId} - + insert into ma_order_info order_id, @@ -79,6 +79,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + insert into ma_order_details + + id, + order_id, + need_company, + plan_start_time, + is_machinist, + address_id, + address, + duration, + invoice_type, + description, + ma_id, + lease_type, + lease_price, + machinist_price, + order_contract, + machinist_name, + phone, + logistics_phone, + real_start_time, + renter_name, + tenant_name, + entry_attachment, + + + #{id}, + #{orderId}, + #{needCompany}, + #{planStartTime}, + #{isMachinist}, + #{addressId}, + #{address}, + #{duration}, + #{invoiceType}, + #{description}, + #{maId}, + #{leaseType}, + #{leasePrice}, + #{machinistPrice}, + #{orderContract}, + #{machinistName}, + #{phone}, + #{logisticsPhone}, + #{realStartTime}, + #{renterName}, + #{tenantName}, + #{entryAttachment}, + + + update ma_order_info