diff --git a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java index 1841bec..87a85be 100644 --- a/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java +++ b/zlpt-common/zlpt-common-core/src/main/java/com/bonus/zlpt/common/core/domain/order/vo/OrderInfoVo.java @@ -39,4 +39,6 @@ public class OrderInfoVo extends OrderInfo { private String renterName; private String tenantName; private String entryAttachment; + /* 合同附件 */ + private String contractUrl; } 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 f6ad32d..319748c 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 @@ -123,7 +123,7 @@ public class OrderInfoController extends BaseController @RequiresPermissions("order:info:edit") @Log(title = "订单信息", businessType = BusinessType.UPDATE) @PutMapping - public AjaxResult edit(@RequestBody OrderInfo orderInfo) + public AjaxResult edit(@RequestBody OrderInfoVo orderInfo) { return toAjax(orderInfoService.updateOrderInfo(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 ad8f4b1..839566c 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 @@ -44,7 +44,9 @@ public interface OrderInfoMapper * @param orderInfo 订单信息 * @return 结果 */ - public int updateOrderInfo(OrderInfo orderInfo); + public int updateOrderInfo(OrderInfoVo orderInfo); + + public int updateOrderDetails(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 ff0636b..9fc1320 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 @@ -42,7 +42,7 @@ public interface IOrderInfoService * @param orderInfo 订单信息 * @return 结果 */ - public int updateOrderInfo(OrderInfo orderInfo); + public int updateOrderInfo(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 e8bd41e..39ac55a 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 @@ -2,7 +2,9 @@ package com.bonus.zlpt.order.service.impl; import java.util.List; +import com.bonus.zlpt.common.core.domain.order.dto.FileInfoDto; 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.OrderDetailsMapper; import com.bonus.zlpt.system.api.model.LoginUser; @@ -21,8 +23,11 @@ import com.bonus.zlpt.order.service.IOrderInfoService; @Service public class OrderInfoServiceImpl implements IOrderInfoService { + private final Integer ORDER_ATTACHMENT_DIC_ID = 21; @Autowired private OrderInfoMapper orderInfoMapper; + @Autowired + OrderDetailsMapper orderDetailsMapper; /** * 查询订单信息 @@ -72,8 +77,21 @@ public class OrderInfoServiceImpl implements IOrderInfoService * @return 结果 */ @Override - public int updateOrderInfo(OrderInfo orderInfo) + public int updateOrderInfo(OrderInfoVo orderInfo) { + if (StringUtils.isNotEmpty(orderInfo.getContractUrl())) { + FileInfoDto fileInfoDto = new FileInfoDto(); + fileInfoDto.setModelId(Math.toIntExact(orderInfo.getOrderId())); + fileInfoDto.setFileUrl(orderInfo.getContractUrl()); + fileInfoDto.setDicId(ORDER_ATTACHMENT_DIC_ID); + LoginUser user = SecurityUtils.getLoginUser(); + fileInfoDto.setCreator(String.valueOf(user.getUserid())); + orderDetailsMapper.deleteAttachment(fileInfoDto); + orderDetailsMapper.insertAttachment(fileInfoDto); + } + orderInfoMapper.updateOrderDetails(orderInfo); + LoginUser user = SecurityUtils.getLoginUser(); + orderInfo.setOrderUser(user.getUserid()); return orderInfoMapper.updateOrderInfo(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 c43be86..22103ce 100644 --- a/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml +++ b/zlpt-modules/zlpt-order/src/main/resources/mapper/OrderInfoMapper.xml @@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update ma_order_info p_id = #{pId}, @@ -146,6 +146,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where order_id = #{orderId} + + update ma_order_details + + order_id = #{orderId}, + need_company = #{needCompany}, + plan_start_time = #{planStartTime}, + is_machinist = #{isMachinist}, + address_id = #{addressId}, + address = #{address}, + duration = #{duration}, + invoice_type = #{invoiceType}, + description = #{description}, + ma_id = #{maId}, + lease_type = #{leaseType}, + lease_price = #{leasePrice}, + machinist_price = #{machinistPrice}, + order_contract = #{orderContract}, + machinist_name = #{machinistName}, + phone = #{phone}, + logistics_phone = #{logisticsPhone}, + real_start_time = #{realStartTime}, + renter_name = #{renterName}, + tenant_name = #{tenantName}, + entry_attachment = #{entryAttachment}, + + where order_id = #{orderId} + + delete from ma_order_info where order_id = #{orderId}