Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lingxi-lxy-yanshou
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
后端-黄柯铭
lingxi-lxy-yanshou
Commits
ca54600c
Commit
ca54600c
authored
Aug 04, 2021
by
fhj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复
parent
1f10066e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
QuotedPriceDetailsResponse.java
...api/dto/response/purchase/QuotedPriceDetailsResponse.java
+5
-0
QuotedPriceServiceImpl.java
...y/lingxi/purchase/serviceimpl/QuotedPriceServiceImpl.java
+16
-0
No files found.
purchase-service/purchase-service-api/src/main/java/com/ssy/lingxi/purchase/api/dto/response/purchase/QuotedPriceDetailsResponse.java
View file @
ca54600c
...
...
@@ -259,4 +259,9 @@ public class QuotedPriceDetailsResponse {
*交付地址Id
*/
private
Long
addressId
;
/**
*是否使用使用地市:true-是,false-否
*/
private
Boolean
isAreas
;
}
purchase-service/src/main/java/com/ssy/lingxi/purchase/serviceimpl/QuotedPriceServiceImpl.java
View file @
ca54600c
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment