船务询价加提交接口

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

@@ -192,4 +192,16 @@ public class ShippingEnquiry extends BladeController {
 		}
 		return R.status(orderFreightService.removeById(orderFreight));
 	}
+
+	/**
+	 * 新增或修改 出口采购询价
+	 */
+	@PostMapping("/commit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入order")
+	public R<OrderSubmitDto> commit(@Valid @RequestBody OrderSubmitDto submitDto) {
+		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/IOrderService.java

@@ -103,5 +103,11 @@ public interface IOrderService extends IService<Order> {
 	R<OrderSubmitDto> savePurchase(OrderSubmitDto submitDto);
 
 	IPage<OrderDTO>  listOrderItem(IPage<OrderDTO> iPage, String tradeType, String orderNo,  Long corpId,  String startDate,String endDate);
+	/**
+	 * 提交船务询价信息
+	 * @param submitDto
+	 * @return
+	 */
+	R<OrderSubmitDto> commit(OrderSubmitDto submitDto);
 
 }

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

@@ -331,6 +331,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 				}
 			});
 		}
+		submitDto.setUpdateTime(new Date());
+		submitDto.setUpdateUser(SecureUtil.getUserId());
+		baseMapper.updateById(submitDto);
 		return R.data(submitDto);
 	}
 
@@ -459,7 +462,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	@Override
 	public R<OrderVO> submit(Order order)
 	{
-		order.setOrderStatus("已确认");
+		order.setIfEnquiry("询价确认");
 		order.setUpdateUser(SecureUtil.getUserId());
 		order.setUpdateTime(new Date());
 		baseMapper.updateById(order);
@@ -486,6 +489,52 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
+	public R<OrderSubmitDto> commit(OrderSubmitDto submitDto) {
+		submitDto.setIfShipping("船务确认");
+		submitDto.setUpdateUser(SecureUtil.getUserId());
+		submitDto.setUpdateTime(new Date());
+		if (CollectionUtils.isNotEmpty(submitDto.getOrderFeesList())){
+			submitDto.getOrderFeesList().stream().forEach(item ->{
+				item.setTenantId(SecureUtil.getTenantId());
+				if (item.getId() == null){
+					item.setCreateUser(SecureUtil.getUserId());
+					item.setCreateTime(new Date());
+					item.setPid(submitDto.getId());
+					orderFeesService.save(item);
+				}else {
+					item.setUpdateUser(SecureUtil.getUserId());
+					item.setUpdateTime(new Date());
+					orderFeesService.updateById(item);
+				}
+			});
+		}
+		if (CollectionUtils.isNotEmpty(submitDto.getOrderFreightList())){
+			submitDto.getOrderFreightList().stream().forEach(item ->{
+				item.setTenantId(SecureUtil.getTenantId());
+				if (item.getId() == null){
+					item.setCreateUser(SecureUtil.getUserId());
+					item.setCreateTime(new Date());
+					item.setPid(submitDto.getId());
+					orderFreightService.save(item);
+				}else {
+					item.setUpdateUser(SecureUtil.getUserId());
+					item.setUpdateTime(new Date());
+					orderFreightService.updateById(item);
+				}
+			});
+		}
+		//获取重点推荐的运费
+		List<OrderFreight> list = orderFreightService.list(new QueryWrapper<OrderFreight>().eq("pid", submitDto.getId()).eq("is_deleted", 0).eq("priority_referrer", 1)
+			.eq("tenant_id", SecureUtil.getTenantId()));
+		if (CollectionUtils.isNotEmpty(list)){
+			BigDecimal reduce = list.stream().map(OrderFreight::getOceanFreight).reduce(BigDecimal.ZERO, BigDecimal::add);
+			submitDto.setReferenceOceanFreight(reduce);
+		}
+		baseMapper.updateById(submitDto);//更新原询价单信息
+		return R.data(submitDto);
+	}
+
+	@Override
 	public R<OrderSubmitDto> savePurchase(OrderSubmitDto submitDto) {
 		if (submitDto.getId()== null){
 			submitDto.setCreateUser(SecureUtil.getUserId());