fix
This commit is contained in:
parent
8741259196
commit
fb86c830c0
|
|
@ -24,4 +24,7 @@ public class OrderDetailsVo extends OrderDetails {
|
||||||
|
|
||||||
/* 订单状态 */
|
/* 订单状态 */
|
||||||
private String orderStatus;
|
private String orderStatus;
|
||||||
|
|
||||||
|
/* 合同附件 */
|
||||||
|
private String contractUrl;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ public class OrderDetailsController extends BaseController
|
||||||
@RequiresPermissions("order:details:edit")
|
@RequiresPermissions("order:details:edit")
|
||||||
@Log(title = "订单详细", businessType = BusinessType.UPDATE)
|
@Log(title = "订单详细", businessType = BusinessType.UPDATE)
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public AjaxResult edit(@RequestBody OrderDetails orderDetails)
|
public AjaxResult edit(@RequestBody OrderDetailsVo orderDetails)
|
||||||
{
|
{
|
||||||
return toAjax(orderDetailsService.updateOrderDetails(orderDetails));
|
return toAjax(orderDetailsService.updateOrderDetails(orderDetails));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ public interface OrderDetailsMapper
|
||||||
* @param orderDetails 订单详细
|
* @param orderDetails 订单详细
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int updateOrderDetails(OrderDetails orderDetails);
|
public int updateOrderDetails(OrderDetailsVo orderDetails);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 删除订单详细
|
* 删除订单详细
|
||||||
|
|
@ -61,5 +61,6 @@ public interface OrderDetailsMapper
|
||||||
*/
|
*/
|
||||||
public int deleteOrderDetailsByIds(Long[] ids);
|
public int deleteOrderDetailsByIds(Long[] ids);
|
||||||
|
|
||||||
|
public int deleteAttachment(FileInfoDto fileInfoDto);
|
||||||
public int insertAttachment(FileInfoDto fileInfoDto);
|
public int insertAttachment(FileInfoDto fileInfoDto);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ public interface IOrderDetailsService
|
||||||
* @param orderDetails 订单详细
|
* @param orderDetails 订单详细
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
public int updateOrderDetails(OrderDetails orderDetails);
|
public int updateOrderDetails(OrderDetailsVo orderDetails);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量删除订单详细
|
* 批量删除订单详细
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,9 @@ package com.bonus.zlpt.order.service.impl;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
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.vo.OrderDetailsVo;
|
import com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo;
|
||||||
|
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.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;
|
||||||
|
|
@ -70,8 +72,18 @@ public class OrderDetailsServiceImpl implements IOrderDetailsService
|
||||||
* @return 结果
|
* @return 结果
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public int updateOrderDetails(OrderDetails orderDetails)
|
public int updateOrderDetails(OrderDetailsVo orderDetails)
|
||||||
{
|
{
|
||||||
|
if (StringUtils.isNotEmpty(orderDetails.getContractUrl())) {
|
||||||
|
FileInfoDto fileInfoDto = new FileInfoDto();
|
||||||
|
fileInfoDto.setModelId(Math.toIntExact(orderDetails.getOrderId()));
|
||||||
|
fileInfoDto.setFileUrl(orderDetails.getContractUrl());
|
||||||
|
fileInfoDto.setDicId(ORDER_ATTACHMENT_DIC_ID);
|
||||||
|
LoginUser user = SecurityUtils.getLoginUser();
|
||||||
|
fileInfoDto.setCreator(String.valueOf(user.getUserid()));
|
||||||
|
orderDetailsMapper.deleteAttachment(fileInfoDto);
|
||||||
|
orderDetailsMapper.insertAttachment(fileInfoDto);
|
||||||
|
}
|
||||||
return orderDetailsMapper.updateOrderDetails(orderDetails);
|
return orderDetailsMapper.updateOrderDetails(orderDetails);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</trim>
|
</trim>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<update id="updateOrderDetails" parameterType="com.bonus.zlpt.common.core.domain.order.OrderDetails">
|
<update id="updateOrderDetails" parameterType="com.bonus.zlpt.common.core.domain.order.vo.OrderDetailsVo">
|
||||||
update ma_order_details
|
update ma_order_details
|
||||||
<trim prefix="SET" suffixOverrides=",">
|
<trim prefix="SET" suffixOverrides=",">
|
||||||
<if test="orderId != null">order_id = #{orderId},</if>
|
<if test="orderId != null">order_id = #{orderId},</if>
|
||||||
|
|
@ -159,6 +159,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
</foreach>
|
</foreach>
|
||||||
</delete>
|
</delete>
|
||||||
|
|
||||||
|
<delete id="deleteAttachment" parameterType="com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto">
|
||||||
|
delete from sys_file_info where model_id = #{modelId} and dic_id = #{dicId}
|
||||||
|
</delete>
|
||||||
|
|
||||||
<insert id="insertAttachment">
|
<insert id="insertAttachment">
|
||||||
insert into sys_file_info (
|
insert into sys_file_info (
|
||||||
<if test="modelId != null and modelId != '' ">model_id,</if>
|
<if test="modelId != null and modelId != '' ">model_id,</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue