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
477a2560
Commit
477a2560
authored
Jan 13, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加订单详情显示页面字段
parent
b53f572c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
SConsumerCouponController.java
...hare/web/controller/system/SConsumerCouponController.java
+1
-1
OpenInterfaceController.java
.../share/web/controller/system/OpenInterfaceController.java
+1
-4
OrderVo.java
...-system/src/main/java/share/system/domain/vo/OrderVo.java
+17
-0
No files found.
share-admin/src/main/java/share/web/controller/system/SConsumerCouponController.java
View file @
477a2560
...
@@ -53,8 +53,8 @@ public class SConsumerCouponController extends BaseController
...
@@ -53,8 +53,8 @@ public class SConsumerCouponController extends BaseController
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
SConsumerCoupon
sConsumerCoupon
)
public
TableDataInfo
list
(
SConsumerCoupon
sConsumerCoupon
)
{
{
startPage
();
List
<
SConsumer
>
list
=
sConsumerService
.
list
();
List
<
SConsumer
>
list
=
sConsumerService
.
list
();
startPage
();
if
(
share
.
common
.
utils
.
StringUtils
.
isNotBlank
(
sConsumerCoupon
.
getPhone
()))
{
if
(
share
.
common
.
utils
.
StringUtils
.
isNotBlank
(
sConsumerCoupon
.
getPhone
()))
{
SConsumer
sConsumer
=
list
.
stream
().
filter
(
obj
->
obj
.
getPhone
().
equals
(
sConsumerCoupon
.
getPhone
())).
findFirst
().
orElse
(
null
);
SConsumer
sConsumer
=
list
.
stream
().
filter
(
obj
->
obj
.
getPhone
().
equals
(
sConsumerCoupon
.
getPhone
())).
findFirst
().
orElse
(
null
);
if
(!
ObjectUtils
.
isEmpty
(
sConsumer
))
{
if
(!
ObjectUtils
.
isEmpty
(
sConsumer
))
{
...
...
share-front/src/main/java/share/web/controller/system/OpenInterfaceController.java
View file @
477a2560
...
@@ -14,7 +14,7 @@ public class OpenInterfaceController {
...
@@ -14,7 +14,7 @@ public class OpenInterfaceController {
private
OpenInterfaceService
openInterfaceService
;
private
OpenInterfaceService
openInterfaceService
;
@GetMapping
(
"/order/info"
)
@GetMapping
(
"/order/info"
)
public
AjaxResult
orderInfo
(
String
orderNo
)
{
public
AjaxResult
orderInfo
(
@RequestParam
(
"orderNo"
)
String
orderNo
)
{
return
AjaxResult
.
success
(
openInterfaceService
.
orderInfo
(
orderNo
));
return
AjaxResult
.
success
(
openInterfaceService
.
orderInfo
(
orderNo
));
}
}
...
@@ -23,7 +23,4 @@ public class OpenInterfaceController {
...
@@ -23,7 +23,4 @@ public class OpenInterfaceController {
return
R
.
ok
(
openInterfaceService
.
openDoor
(
orderNo
));
return
R
.
ok
(
openInterfaceService
.
openDoor
(
orderNo
));
}
}
}
}
share-system/src/main/java/share/system/domain/vo/OrderVo.java
View file @
477a2560
...
@@ -88,5 +88,22 @@ public class OrderVo {
...
@@ -88,5 +88,22 @@ public class OrderVo {
//优惠卷名称
//优惠卷名称
private
String
couponName
;
private
String
couponName
;
//订单状态
private
Integer
orderType
;
/**
* 创建时间
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
createTime
;
/**
* 更新时间
*/
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
updateTime
;
private
Integer
status
;
}
}
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