fix
This commit is contained in:
parent
3753a0695a
commit
3d06a48f9f
|
|
@ -27,4 +27,6 @@ public class OrderDetailsVo extends OrderDetails {
|
||||||
|
|
||||||
/* 合同附件 */
|
/* 合同附件 */
|
||||||
private String contractUrl;
|
private String contractUrl;
|
||||||
|
|
||||||
|
private String payType;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ public class OrderDetailsController extends BaseController
|
||||||
@RequiresPermissions("order:details:add")
|
@RequiresPermissions("order:details:add")
|
||||||
@Log(title = "订单详细", businessType = BusinessType.INSERT)
|
@Log(title = "订单详细", businessType = BusinessType.INSERT)
|
||||||
@PostMapping
|
@PostMapping
|
||||||
public AjaxResult add(@RequestBody OrderDetails orderDetails)
|
public AjaxResult add(@RequestBody OrderDetailsVo orderDetails)
|
||||||
{
|
{
|
||||||
return toAjax(orderDetailsService.insertOrderDetails(orderDetails));
|
return toAjax(orderDetailsService.insertOrderDetails(orderDetails));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ public interface OrderDetailsMapper
|
||||||
* @param orderDetails 订单详细
|
* @param orderDetails 订单详细
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int insertOrderDetails(OrderDetails orderDetails);
|
public int insertOrderDetails(OrderDetailsVo orderDetails);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改订单详细
|
* 修改订单详细
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ public interface IOrderDetailsService
|
||||||
* @param orderDetails 订单详细
|
* @param orderDetails 订单详细
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int insertOrderDetails(OrderDetails orderDetails);
|
public int insertOrderDetails(OrderDetailsVo orderDetails);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改订单详细
|
* 修改订单详细
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,14 @@
|
||||||
package com.bonus.zlpt.order.service.impl;
|
package com.bonus.zlpt.order.service.impl;
|
||||||
|
|
||||||
import java.util.List;
|
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.ContractInfoDto;
|
||||||
import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto;
|
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.OrderDetailsVo;
|
||||||
|
import com.bonus.zlpt.common.core.domain.order.vo.OrderInfoVo;
|
||||||
import com.bonus.zlpt.common.core.utils.StringUtils;
|
import com.bonus.zlpt.common.core.utils.StringUtils;
|
||||||
import com.bonus.zlpt.common.security.utils.SecurityUtils;
|
import com.bonus.zlpt.common.security.utils.SecurityUtils;
|
||||||
|
import com.bonus.zlpt.order.mapper.OrderInfoMapper;
|
||||||
import com.bonus.zlpt.system.api.model.LoginUser;
|
import com.bonus.zlpt.system.api.model.LoginUser;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -28,7 +30,8 @@ public class OrderDetailsServiceImpl implements IOrderDetailsService
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private OrderDetailsMapper orderDetailsMapper;
|
private OrderDetailsMapper orderDetailsMapper;
|
||||||
|
@Autowired
|
||||||
|
private OrderInfoMapper orderInfoMapper;
|
||||||
/**
|
/**
|
||||||
* 查询订单详细
|
* 查询订单详细
|
||||||
*
|
*
|
||||||
|
|
@ -60,9 +63,18 @@ public class OrderDetailsServiceImpl implements IOrderDetailsService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@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);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
where id = #{id}
|
where id = #{id}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<insert id="insertOrderDetails" parameterType="com.bonus.zlpt.common.core.domain.order.OrderDetails">
|
<insert id="insertOrderDetails" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo">
|
||||||
insert into ma_order_details
|
insert into ma_order_details
|
||||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||||
<if test="id != null">id,</if>
|
<if test="id != null">id,</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue