diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java index 469c54c..9bfe5d2 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderDetailsVo.java @@ -27,4 +27,6 @@ public class OrderDetailsVo extends OrderDetails { /* 合同附件 */ private String contractUrl; + + private String payType; } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java index daf1dcd..487cd1c 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java @@ -98,7 +98,7 @@ public class OrderDetailsController extends BaseController @RequiresPermissions("order:details:add") @Log(title = "订单详细", businessType = BusinessType.INSERT) @PostMapping - public AjaxResult add(@RequestBody OrderDetails orderDetails) + public AjaxResult add(@RequestBody OrderDetailsVo orderDetails) { return toAjax(orderDetailsService.insertOrderDetails(orderDetails)); } diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java index b61f1c6..88f90d7 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/mapper/OrderDetailsMapper.java @@ -35,7 +35,7 @@ public interface OrderDetailsMapper * @param orderDetails 订单详细 * @return 结果 */ - public int insertOrderDetails(OrderDetails orderDetails); + public int insertOrderDetails(OrderDetailsVo orderDetails); /** * 修改订单详细 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java index 4573d36..e0cffd9 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/IOrderDetailsService.java @@ -35,7 +35,7 @@ public interface IOrderDetailsService * @param orderDetails 订单详细 * @return 结果 */ - public int insertOrderDetails(OrderDetails orderDetails); + public int insertOrderDetails(OrderDetailsVo orderDetails); /** * 修改订单详细 diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java index 40f669f..d173c9b 100644 --- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java +++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/service/impl/OrderDetailsServiceImpl.java @@ -1,12 +1,14 @@ package com.bonus.zlpt.order.service.impl; import java.util.List; - +import java.util.Random; import com.bonus.zlpt.common.core.domain.order.dto.ContractInfoDto; import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto; import com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo; +import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo; import com.bonus.zlpt.common.core.utils.StringUtils; import com.bonus.zlpt.common.security.utils.SecurityUtils; +import com.bonus.zlpt.order.mapper.OrderInfoMapper; import com.bonus.zlpt.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +30,8 @@ public class OrderDetailsServiceImpl implements IOrderDetailsService @Autowired private OrderDetailsMapper orderDetailsMapper; - + @Autowired + private OrderInfoMapper orderInfoMapper; /** * 查询订单详细 * @@ -60,9 +63,18 @@ public class OrderDetailsServiceImpl implements IOrderDetailsService * @return 结果 */ @Override - public int insertOrderDetails(OrderDetails orderDetails) + public int insertOrderDetails(OrderDetailsVo orderDetails) { - return orderDetailsMapper.insertOrderDetails(orderDetails); + Random random = new Random(); + long orderId = random.nextInt(99999999) + 1; + orderDetails.setOrderId(orderId); + orderDetailsMapper.insertOrderDetails(orderDetails); + //add orderInfo + OrderInfoVo orderInfoVo = new OrderInfoVo(); + orderInfoVo.setOrderId(orderId); + orderInfoVo.setOrderStatus(orderDetails.getOrderStatus()); + orderInfoVo.setPayType(orderDetails.getPayType()); + return orderInfoMapper.insertOrderInfo(orderInfoVo); } /** diff --git a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml index cab5242..3a3a584 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - + insert into ma_order_details id,