Commit ca54600c authored by fhj's avatar fhj

修复

parent 1f10066e
......@@ -259,4 +259,9 @@ public class QuotedPriceDetailsResponse {
*交付地址Id
*/
private Long addressId;
/**
*是否使用使用地市:true-是,false-否
*/
private Boolean isAreas;
}
......@@ -1014,6 +1014,7 @@ public class QuotedPriceServiceImpl extends BasePurchaseInquiry implements Quote
}
QuotedPriceDetailsResponse response = new QuotedPriceDetailsResponse();
BeanUtils.copyProperties(quotedPrice, response);
List<QuotedPriceDetails> quotedPriceDetailss = quotedPriceDetailsRepository.findAllByQuotedPriceId(quotedPrice.getId());
response.setQuotedPriceProducts(intoQuotedPriceDetailsResponse(quotedPriceDetailss));
......@@ -1030,6 +1031,21 @@ public class QuotedPriceServiceImpl extends BasePurchaseInquiry implements Quote
//查询外部流转状态
PurchaseInquiry purchaseInquiry = purchaseInquiryRepository.findById(quotedPrice.getPurchaseInquiryId()).orElse(null);
response.setExternalLogStates(getLogStateResponse(ProcessEnum.PURCHASE_INQUIRY_OUTER_VERIFY.getCode(), quotedPrice.getExternalNextStep(),Collections.singletonList(quotedPrice.getCreateMemberRoleId()),purchaseInquiry.getCreateMemberRoleId()));
response.setAreas(purchaseInquiry.getAreas().stream().map(temp -> {
CountryAreaResponse countryArea=new CountryAreaResponse();
BeanUtils.copyProperties(temp,countryArea);
return countryArea;
}).collect(Collectors.toList()));
response.setIsAreas(OrderConstant.State.START.equals(purchaseInquiry.getIsAreas()));
response.setAddress(purchaseInquiry.getAddress());
response.setAddressId(purchaseInquiry.getAddressId());
response.setOffer(purchaseInquiry.getOffer());
response.setPaymentType(purchaseInquiry.getPaymentType());
response.setTaxes(purchaseInquiry.getTaxes());
response.setLogistics(purchaseInquiry.getLogistics());
response.setPackRequire(purchaseInquiry.getPackRequire());
response.setOtherRequire(purchaseInquiry.getOtherRequire());
return Wrapper.success(response);
}
......
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