Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
yangxiujun
/
paidan_demo
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 6e1de546
authored
Nov 02, 2023
by
huangjinxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:订单相关添加返回字段
1 parent
e4b4382c
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java
View file @
6e1de54
package
com
.
dituhui
.
pea
.
order
.
service
.
impl
;
import
cn.hutool.core.util.ObjectUtil
;
import
com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.dituhui.pea.common.BusinessException
;
...
...
@@ -157,8 +158,8 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
record
.
setTranscend
(
o
.
getTranscend
());
record
.
setIsSpecialTime
(
o
.
getIsSpecialTime
());
record
.
setActualStartTime
(
TimeUtils
.
IsoTimestamp2DateTime
(
o
.
getActualStartTime
()));
record
.
setActualEndTime
(
TimeUtils
.
IsoTimestamp2DateTime
(
o
.
getActualEndTime
()));
record
.
setActualStartTime
(
ObjectUtil
.
isNull
(
o
.
getActualStartTime
())
?
""
:
TimeUtils
.
IsoTimestamp2DateTime
(
o
.
getActualStartTime
()));
record
.
setActualEndTime
(
ObjectUtil
.
isNull
(
o
.
getActualStartTime
())
?
""
:
TimeUtils
.
IsoTimestamp2DateTime
(
o
.
getActualEndTime
()));
if
(
StringUtils
.
isNotEmpty
(
o
.
getMultipleOrders
()))
{
List
<
OrderInfoEntity
>
byMultipleOrders
=
orderInfoDao
.
findByMultipleOrdersAndOrderIdNot
(
o
.
getMultipleOrders
(),
o
.
getOrderId
());
List
<
OrderServiceList
>
multipleItems
=
new
ArrayList
<>();
...
...
Write
Preview
Markdown
is supported
Attach a file
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 post a comment