From fb86c830c05ba57d6afdff41e518fe978a702eb4 Mon Sep 17 00:00:00 2001 From: sxu <1539530615@qq.com> Date: Wed, 6 Dec 2023 13:48:30 +0800 Subject: [PATCH] fix --- .../core/domain/order/vo/OrderDetailsVo.java | 3 +++ .../order/controller/OrderDetailsController.java | 2 +- .../zlpt/order/mapper/OrderDetailsMapper.java | 3 ++- .../zlpt/order/service/IOrderDetailsService.java | 2 +- .../service/impl/OrderDetailsServiceImpl.java | 14 +++++++++++++- .../main/resources/mapper/OrderDetailsMapper.xml | 6 +++++- 6 files changed, 25 insertions(+), 5 deletions(-) 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 819a8c1..469c54c 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 @@ -24,4 +24,7 @@ public class OrderDetailsVo extends OrderDetails { /* 订单状态 */ private String orderStatus; + + /* 合同附件 */ + private String contractUrl; } 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 fa599c0..daf1dcd 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 @@ -109,7 +109,7 @@ public class OrderDetailsController extends BaseController @RequiresPermissions("order:details:edit") @Log(title = "订单详细", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody OrderDetails orderDetails) + public AjaxResult edit(@RequestBody OrderDetailsVo orderDetails) { return toAjax(orderDetailsService.updateOrderDetails(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 de36c1f..b61f1c6 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 @@ -43,7 +43,7 @@ public interface OrderDetailsMapper * @param orderDetails 订单详细 * @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 deleteAttachment(FileInfoDto fileInfoDto); public int insertAttachment(FileInfoDto fileInfoDto); } 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 419a033..4573d36 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 @@ -43,7 +43,7 @@ public interface IOrderDetailsService * @param orderDetails 订单详细 * @return 结果 */ - public int updateOrderDetails(OrderDetails orderDetails); + public int updateOrderDetails(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 068c403..40f669f 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 @@ -3,7 +3,9 @@ package com.bonus.zlpt.order.service.impl; import java.util.List; 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.utils.StringUtils; import com.bonus.zlpt.common.security.utils.SecurityUtils; import com.bonus.zlpt.system.api.model.LoginUser; import org.springframework.beans.factory.annotation.Autowired; @@ -70,8 +72,18 @@ public class OrderDetailsServiceImpl implements IOrderDetailsService * @return 结果 */ @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); } 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 dbd7397..cab5242 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderDetailsMapper.xml @@ -120,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ma_order_details order_id = #{orderId}, @@ -159,6 +159,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + delete from sys_file_info where model_id = #{modelId} and dic_id = #{dicId} + + insert into sys_file_info ( model_id,