Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Q
qk_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
quanku
qk_backend
Commits
ba254b70
Commit
ba254b70
authored
Dec 22, 2023
by
shiyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
查询估价详情,倒计时时间
parent
f9d497be
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
ch-core/src/main/java/com/wwdz/ch/core/entity/ConsignSaleRecordVo.java
...ain/java/com/wwdz/ch/core/entity/ConsignSaleRecordVo.java
+10
-0
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
...main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
+14
-3
No files found.
ch-core/src/main/java/com/wwdz/ch/core/entity/ConsignSaleRecordVo.java
View file @
ba254b70
...
@@ -42,4 +42,14 @@ public class ConsignSaleRecordVo implements Entity {
...
@@ -42,4 +42,14 @@ public class ConsignSaleRecordVo implements Entity {
*/
*/
private
String
customStateName
;
private
String
customStateName
;
/**
* 系统状态
*/
private
Integer
systemState
;
/**
* 系统状态
*/
private
String
systemStateName
;
}
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
View file @
ba254b70
...
@@ -37,6 +37,8 @@ import org.springframework.util.CollectionUtils;
...
@@ -37,6 +37,8 @@ import org.springframework.util.CollectionUtils;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.StringUtils
;
import
org.springframework.util.StringUtils
;
import
java.time.Duration
;
import
java.time.Instant
;
import
java.util.*
;
import
java.util.*
;
import
java.util.function.Function
;
import
java.util.function.Function
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -332,6 +334,8 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
...
@@ -332,6 +334,8 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleRecordVo
.
setImage
(
item
.
getImages
().
split
(
";"
)[
0
]);
consignSaleRecordVo
.
setImage
(
item
.
getImages
().
split
(
";"
)[
0
]);
consignSaleRecordVo
.
setItemName
(
item
.
getName
());
consignSaleRecordVo
.
setItemName
(
item
.
getName
());
consignSaleRecordVo
.
setCustomState
(
consignSale
.
getCustomState
());
consignSaleRecordVo
.
setCustomState
(
consignSale
.
getCustomState
());
consignSaleRecordVo
.
setSystemState
(
consignSale
.
getSystemState
());
consignSaleRecordVo
.
setSystemStateName
(
ConsignSaleEnum
.
SaleForSysStateEnum
.
getNameByCode
(
consignSale
.
getSystemState
()));
consignSaleRecordVo
.
setIsTimeOut
(
false
);
consignSaleRecordVo
.
setIsTimeOut
(
false
);
consignSaleRecordVo
.
setTip
(
"初步估价结果仅供参考,想要获得真实的报价需要将货品送至平台,由平台专家对实物进行专业鉴定才可以得出结果。"
);
consignSaleRecordVo
.
setTip
(
"初步估价结果仅供参考,想要获得真实的报价需要将货品送至平台,由平台专家对实物进行专业鉴定才可以得出结果。"
);
consignSaleRecordList
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
VALUATE
.
getCode
()).
collect
(
Collectors
.
toList
());
consignSaleRecordList
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
VALUATE
.
getCode
()).
collect
(
Collectors
.
toList
());
...
@@ -342,9 +346,11 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
...
@@ -342,9 +346,11 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleRecordVo
.
setIsHasPrice
(
true
);
consignSaleRecordVo
.
setIsHasPrice
(
true
);
consignSaleRecordVo
.
setContent
(
consignSaleRecordList
.
get
(
0
).
getContent
());
consignSaleRecordVo
.
setContent
(
consignSaleRecordList
.
get
(
0
).
getContent
());
consignSaleRecordVo
.
setRemark
(
consignSaleRecordList
.
get
(
0
).
getRemark
());
consignSaleRecordVo
.
setRemark
(
consignSaleRecordList
.
get
(
0
).
getRemark
());
consignSaleRecordVo
.
setTime
(
consignSaleRecordList
.
get
(
0
).
getCreateTime
());
Date
date
=
consignSaleRecordList
.
get
(
0
).
getCreateTime
();
Instant
instant
=
date
.
toInstant
().
plus
(
Duration
.
ofHours
(
24
));
Date
time
=
Date
.
from
(
instant
);
consignSaleRecordVo
.
setTime
(
time
);
}
}
long
num
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
USER_CONFIRM_VALUATE
.
getCode
()).
count
();
long
num
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
USER_CONFIRM_VALUATE
.
getCode
()).
count
();
//尚未确认
//尚未确认
if
(
num
==
0
)
{
if
(
num
==
0
)
{
...
@@ -385,6 +391,8 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
...
@@ -385,6 +391,8 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleRecordVo
.
setImage
(
item
.
getImages
().
split
(
";"
)[
0
]);
consignSaleRecordVo
.
setImage
(
item
.
getImages
().
split
(
";"
)[
0
]);
consignSaleRecordVo
.
setItemName
(
item
.
getName
());
consignSaleRecordVo
.
setItemName
(
item
.
getName
());
consignSaleRecordVo
.
setCustomState
(
consignSale
.
getCustomState
());
consignSaleRecordVo
.
setCustomState
(
consignSale
.
getCustomState
());
consignSaleRecordVo
.
setSystemState
(
consignSale
.
getSystemState
());
consignSaleRecordVo
.
setSystemStateName
(
ConsignSaleEnum
.
SaleForSysStateEnum
.
getNameByCode
(
consignSale
.
getSystemState
()));
consignSaleRecordVo
.
setIsTimeOut
(
false
);
consignSaleRecordVo
.
setIsTimeOut
(
false
);
List
<
ConsignSaleRecord
>
consignSaleRecordList
=
consignSaleRecordDao
.
find
(
saleId
);
List
<
ConsignSaleRecord
>
consignSaleRecordList
=
consignSaleRecordDao
.
find
(
saleId
);
consignSaleRecordList
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
IDENTIFY
.
getCode
()).
collect
(
Collectors
.
toList
());
consignSaleRecordList
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
IDENTIFY
.
getCode
()).
collect
(
Collectors
.
toList
());
...
@@ -395,7 +403,10 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
...
@@ -395,7 +403,10 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSaleRecordVo
.
setIsHasPrice
(
true
);
consignSaleRecordVo
.
setIsHasPrice
(
true
);
consignSaleRecordVo
.
setContent
(
consignSaleRecordList
.
get
(
0
).
getContent
());
consignSaleRecordVo
.
setContent
(
consignSaleRecordList
.
get
(
0
).
getContent
());
consignSaleRecordVo
.
setRemark
(
consignSaleRecordList
.
get
(
0
).
getRemark
());
consignSaleRecordVo
.
setRemark
(
consignSaleRecordList
.
get
(
0
).
getRemark
());
consignSaleRecordVo
.
setTime
(
consignSaleRecordList
.
get
(
0
).
getCreateTime
());
Date
date
=
consignSaleRecordList
.
get
(
0
).
getCreateTime
();
Instant
instant
=
date
.
toInstant
().
plus
(
Duration
.
ofHours
(
24
));
Date
time
=
Date
.
from
(
instant
);
consignSaleRecordVo
.
setTime
(
time
);
}
}
long
num
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
USER_CONFIRM_IDENTIFY
.
getCode
()).
count
();
long
num
=
consignSaleRecordList
.
stream
().
filter
(
consignSaleRecord
->
consignSaleRecord
.
getType
().
intValue
()
==
ConsignSaleEnum
.
OperateTypeEnum
.
USER_CONFIRM_IDENTIFY
.
getCode
()).
count
();
//尚未确认
//尚未确认
...
...
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