Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
O
on-site-service
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
external
on-site-service
Commits
95fddbba
Commit
95fddbba
authored
Jul 22, 2022
by
lining
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 服务订单价格
parent
98b5af46
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
0 deletions
+5
-0
ServiceOrderVO.java
...ava/com/onsiteservice/common/order/vo/ServiceOrderVO.java
+4
-0
ServiceOrderBizService.java
...service/miniapp/service/order/ServiceOrderBizService.java
+1
-0
No files found.
common/src/main/java/com/onsiteservice/common/order/vo/ServiceOrderVO.java
View file @
95fddbba
...
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
...
@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -63,4 +64,7 @@ public class ServiceOrderVO {
...
@@ -63,4 +64,7 @@ public class ServiceOrderVO {
@ApiModelProperty
(
value
=
"订单状态 1待受理,2 已拍估价员 3待支付,4待派单,5服务中,6已完成,7已取消 "
)
@ApiModelProperty
(
value
=
"订单状态 1待受理,2 已拍估价员 3待支付,4待派单,5服务中,6已完成,7已取消 "
)
private
String
orderStatus
;
private
String
orderStatus
;
@ApiModelProperty
(
value
=
"价格"
)
private
BigDecimal
price
;
}
}
\ No newline at end of file
mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java
View file @
95fddbba
...
@@ -351,6 +351,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
...
@@ -351,6 +351,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
serviceOrderVO
.
setRemark
(
serviceOrder
.
getRemark
());
serviceOrderVO
.
setRemark
(
serviceOrder
.
getRemark
());
serviceOrderVO
.
setCreateTime
(
serviceOrder
.
getCreateTime
());
serviceOrderVO
.
setCreateTime
(
serviceOrder
.
getCreateTime
());
serviceOrderVO
.
setOrderStatus
(
String
.
valueOf
(
serviceOrder
.
getOrderStatus
()));
serviceOrderVO
.
setOrderStatus
(
String
.
valueOf
(
serviceOrder
.
getOrderStatus
()));
serviceOrderVO
.
setPrice
(
serviceOrder
.
getPrice
());
// 剩余时间
// 剩余时间
if
(
serviceOrder
.
getOrderStatus
().
equals
(
ServiceOrderStatusEnum
.
SEND
.
getStatus
()))
{
if
(
serviceOrder
.
getOrderStatus
().
equals
(
ServiceOrderStatusEnum
.
SEND
.
getStatus
()))
{
long
left
=
Math
.
max
(
serviceOrder
.
getCancelTime
().
getTime
()
-
System
.
currentTimeMillis
(),
0
);
long
left
=
Math
.
max
(
serviceOrder
.
getCancelTime
().
getTime
()
-
System
.
currentTimeMillis
(),
0
);
...
...
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