船务询价加提交接口

blade-service/trade-purchase/src/main/java/com/trade/purchase/enquiry/ShippingEnquiry.java

@@ -1,6 +1,7 @@
 package com.trade.purchase.enquiry;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.trade.purchase.order.dto.OrderSubmitDto;
 import com.trade.purchase.order.entity.*;
@@ -200,6 +201,9 @@ public class ShippingEnquiry extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入order")
 	public R<OrderSubmitDto> commit(@Valid @RequestBody OrderSubmitDto submitDto) {
+		if (StringUtils.isNotBlank(submitDto.getIfShipping()) && submitDto.getIfShipping().equals("船务确认")){
+			throw new RuntimeException("请勿重复提交");
+		}
 		submitDto.setBillType(OrderTypeEnum.ENQUIRY.getType());
 		submitDto.setTradeTypeEnum(OrderTypeEnum.EXPORT);
 		return orderService.commit(submitDto);

blade-service/trade-purchase/src/main/java/com/trade/purchase/order/service/impl/OrderServiceImpl.java

@@ -334,6 +334,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		submitDto.setUpdateTime(new Date());
 		submitDto.setUpdateUser(SecureUtil.getUserId());
 		baseMapper.updateById(submitDto);
+		//获取订单明细信息
+		List<OrderItems> orderItemsList = this.getOrderItems(submitDto.getId(),SecureUtil.getUserId());
+		if (CollectionUtils.isNotEmpty(orderItemsList)) {
+			submitDto.setItemsVOList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
+		}
 		return R.data(submitDto);
 	}
 
@@ -385,7 +390,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		//获取订单运费
 		List<OrderFreight> orderFreightList = orderFreightService.list(Wrappers.<OrderFreight>lambdaQuery().eq(OrderFreight::getPid, vo.getId())
 			.eq(OrderFreight::getTenantId, SecureUtil.getTenantId()).eq(OrderFreight::getIsDeleted, 0));
-		if (CollectionUtils.isNotEmpty(modifyList)) {
+		if (CollectionUtils.isNotEmpty(orderFreightList)) {
 			vo.setOrderFreightList(orderFreightList);
 		}
 		return R.data(vo);
@@ -531,6 +536,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			submitDto.setReferenceOceanFreight(reduce);
 		}
 		baseMapper.updateById(submitDto);//更新原询价单信息
+		//获取订单明细信息
+		List<OrderItems> orderItemsList = this.getOrderItems(submitDto.getId(),SecureUtil.getUserId());
+		if (CollectionUtils.isNotEmpty(orderItemsList)) {
+			submitDto.setItemsVOList(orderItemsList.stream().map(orderItemMapstructMapper::toVo).collect(Collectors.toList()));
+		}
 		return R.data(submitDto);
 	}