Commit 2f910c29 authored by zhengyi's avatar zhengyi

报价单详情返回客户编号

parent ea0ff157
...@@ -646,6 +646,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -646,6 +646,7 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
if (Objects.isNull(offerDO)) { if (Objects.isNull(offerDO)) {
throw exception(OFFER_NOT_EXISTS); throw exception(OFFER_NOT_EXISTS);
} }
OfferRespVO respVO = OfferConvert.INSTANCE.convert(offerDO); OfferRespVO respVO = OfferConvert.INSTANCE.convert(offerDO);
EstCostVO estCostVO = JSONObject.parseObject(offerDO.getEstCost(), EstCostVO.class); EstCostVO estCostVO = JSONObject.parseObject(offerDO.getEstCost(), EstCostVO.class);
if (Objects.nonNull(estCostVO)) { if (Objects.nonNull(estCostVO)) {
...@@ -672,6 +673,13 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl ...@@ -672,6 +673,13 @@ public class OfferServiceImpl extends AbstractService<OfferMapper, OfferDO> impl
warehouseLineMapper.getStartInfoAndDestInfoByLineId( warehouseLineMapper.getStartInfoAndDestInfoByLineId(
respVO.getLineId()); respVO.getLineId());
respVO.setLogisticsInfoDto(logisticsInfoDto); respVO.setLogisticsInfoDto(logisticsInfoDto);
// 客户编号
if (Objects.nonNull(respVO.getRelationId())) {
CustomerDO customerDO = customerService.getById(respVO.getRelationId());
if (Objects.nonNull(customerDO)) {
respVO.setCustomerNumber(customerDO.getNumber());
}
}
return respVO; return respVO;
} }
......
...@@ -112,6 +112,9 @@ public class OfferBaseVO { ...@@ -112,6 +112,9 @@ public class OfferBaseVO {
@ApiModelProperty(value = "客户经理ID") @ApiModelProperty(value = "客户经理ID")
private Long salesmanId; private Long salesmanId;
@ApiModelProperty(value = "客户编号")
private String customerNumber;
@ApiModelProperty(value = "客户经理所属部门ID") @ApiModelProperty(value = "客户经理所属部门ID")
private Long deptId; private Long deptId;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment