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
3b36b6b6
Commit
3b36b6b6
authored
Aug 11, 2022
by
shangtx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 新的支付成功问题
parent
bfb1d1ee
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ServiceOrderController.java
...ervice/admin/controller/order/ServiceOrderController.java
+0
-1
ServiceOrderBizService.java
...service/miniapp/service/order/ServiceOrderBizService.java
+2
-1
No files found.
admin/src/main/java/com/onsiteservice/admin/controller/order/ServiceOrderController.java
View file @
3b36b6b6
...
@@ -35,7 +35,6 @@ import static com.onsiteservice.core.result.ResultGenerator.success;
...
@@ -35,7 +35,6 @@ import static com.onsiteservice.core.result.ResultGenerator.success;
* @date 2022-07-14 15:11
* @date 2022-07-14 15:11
* @description ServiceOrderController控制类
* @description ServiceOrderController控制类
*/
*/
@ApiIgnore
@Api
(
tags
=
"ServiceOrderController"
)
@Api
(
tags
=
"ServiceOrderController"
)
@RestController
@RestController
@RequestMapping
(
"/order"
)
@RequestMapping
(
"/order"
)
...
...
mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderBizService.java
View file @
3b36b6b6
...
@@ -53,6 +53,7 @@ import tk.mybatis.mapper.entity.Condition;
...
@@ -53,6 +53,7 @@ import tk.mybatis.mapper.entity.Condition;
import
javax.annotation.Resource
;
import
javax.annotation.Resource
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
java.math.BigDecimal
;
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
;
...
@@ -232,7 +233,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
...
@@ -232,7 +233,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
var
order
=
selectOneByProperty
(
"orderNo"
,
no
);
var
order
=
selectOneByProperty
(
"orderNo"
,
no
);
order
.
setOrderStatus
(
order
.
getSkipWork
()
?
ServiceOrderStatusEnum
.
DISPATCH
.
getStatus
()
:
ServiceOrderStatusEnum
.
PAY
.
getStatus
());
order
.
setOrderStatus
(
order
.
getSkipWork
()
?
ServiceOrderStatusEnum
.
DISPATCH
.
getStatus
()
:
ServiceOrderStatusEnum
.
PAY
.
getStatus
());
order
.
setTotalPrice
(
order
.
getTotalPrice
().
add
(
order
.
getPrice
()));
order
.
setTotalPrice
(
order
.
getTotalPrice
()
==
null
?
order
.
getPrice
():
order
.
getTotalPrice
()
.
add
(
order
.
getPrice
()));
order
.
setPayNum
(
order
.
getPayNum
()
+
1
);
order
.
setPayNum
(
order
.
getPayNum
()
+
1
);
int
result
=
serviceOrderMapper
.
updateByPrimaryKeySelective
(
order
);
int
result
=
serviceOrderMapper
.
updateByPrimaryKeySelective
(
order
);
...
...
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