Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gxpt_ht
Overview
Overview
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
pseer
gxpt_ht
Commits
019f40c5
Commit
019f40c5
authored
Nov 24, 2023
by
wuwenlong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order list roomImage\roomType\roomTypeName missing value bugfix;
parent
df3cc432
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
0 deletions
+30
-0
RoomType.java
share-common/src/main/java/share/common/enums/RoomType.java
+19
-0
SOrderVo.java
...system/src/main/java/share/system/domain/vo/SOrderVo.java
+8
-0
SOrderServiceImpl.java
...ain/java/share/system/service/impl/SOrderServiceImpl.java
+3
-0
No files found.
share-common/src/main/java/share/common/enums/RoomType.java
View file @
019f40c5
package
share
.
common
.
enums
;
package
share
.
common
.
enums
;
import
share.common.utils.StringUtils
;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Objects
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
public
enum
RoomType
{
public
enum
RoomType
{
...
@@ -25,6 +28,22 @@ public enum RoomType {
...
@@ -25,6 +28,22 @@ public enum RoomType {
return
String
.
join
(
","
,
list
);
return
String
.
join
(
","
,
list
);
}
}
public
static
RoomType
getEnumByCode
(
String
code
){
for
(
RoomType
type
:
RoomType
.
values
())
{
if
(
StringUtils
.
equals
(
type
.
code
,
code
))
{
return
type
;
}
}
return
null
;
}
public
static
String
getNameByCode
(
String
code
){
RoomType
type
=
getEnumByCode
(
code
);
if
(
Objects
.
nonNull
(
type
)){
return
type
.
name
;
}
return
""
;
}
public
String
getCode
()
{
public
String
getCode
()
{
return
code
;
return
code
;
...
...
share-system/src/main/java/share/system/domain/vo/SOrderVo.java
View file @
019f40c5
...
@@ -165,6 +165,14 @@ public class SOrderVo
...
@@ -165,6 +165,14 @@ public class SOrderVo
@ApiModelProperty
(
value
=
"房间图片"
)
@ApiModelProperty
(
value
=
"房间图片"
)
private
String
roomImages
;
private
String
roomImages
;
//房间图片
@ApiModelProperty
(
value
=
"房间类型"
)
private
String
roomType
;
//房间图片
@ApiModelProperty
(
value
=
"房间类型名称"
)
private
String
roomTypeName
;
/** 门店地址 */
/** 门店地址 */
@ApiModelProperty
(
value
=
"门店地址"
)
@ApiModelProperty
(
value
=
"门店地址"
)
private
String
address
;
private
String
address
;
...
...
share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java
View file @
019f40c5
...
@@ -700,6 +700,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
...
@@ -700,6 +700,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
roomList
.
stream
().
forEach
(
room
->
{
roomList
.
stream
().
forEach
(
room
->
{
if
(
room
.
getId
().
equals
(
vo
.
getRoomId
()))
{
if
(
room
.
getId
().
equals
(
vo
.
getRoomId
()))
{
vo
.
setRoomName
(
room
.
getName
());
vo
.
setRoomName
(
room
.
getName
());
vo
.
setRoomImages
(
room
.
getImages
());
vo
.
setRoomType
(
room
.
getRoomType
());
vo
.
setRoomTypeName
(
RoomType
.
getNameByCode
(
room
.
getRoomType
()));
}
}
});
});
if
(
Objects
.
nonNull
(
vo
.
getCouponId
()))
{
if
(
Objects
.
nonNull
(
vo
.
getCouponId
()))
{
...
...
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