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
86222f29
Commit
86222f29
authored
May 06, 2024
by
吕明尚
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
门店显示多少时间有人预定,默认为3小时前有人预定
parent
8d2f38b4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
SConsumerCouponController.java
...hare/web/controller/system/SConsumerCouponController.java
+1
-1
SStoreServiceImpl.java
...ain/java/share/system/service/impl/SStoreServiceImpl.java
+2
-2
No files found.
share-front/src/main/java/share/web/controller/system/SConsumerCouponController.java
View file @
86222f29
...
@@ -61,7 +61,7 @@ public class SConsumerCouponController extends BaseController {
...
@@ -61,7 +61,7 @@ public class SConsumerCouponController extends BaseController {
public
R
<
List
<
SConsumerCouponVo
>>
query
(
@RequestBody
@Validated
CouponRequest
couponRequest
)
{
public
R
<
List
<
SConsumerCouponVo
>>
query
(
@RequestBody
@Validated
CouponRequest
couponRequest
)
{
List
<
SConsumerCouponVo
>
sConsumerCoupons
=
sConsumerCouponService
.
availableCouponList
(
couponRequest
);
List
<
SConsumerCouponVo
>
sConsumerCoupons
=
sConsumerCouponService
.
availableCouponList
(
couponRequest
);
if
(
CollectionUtils
.
isEmpty
(
sConsumerCoupons
))
{
if
(
CollectionUtils
.
isEmpty
(
sConsumerCoupons
))
{
return
R
.
fail
(
sConsumerCoupons
,
"暂无可用优惠券"
);
return
R
.
ok
(
sConsumerCoupons
,
"暂无可用优惠券"
);
}
else
{
}
else
{
return
R
.
ok
(
sConsumerCoupons
);
return
R
.
ok
(
sConsumerCoupons
);
}
}
...
...
share-system/src/main/java/share/system/service/impl/SStoreServiceImpl.java
View file @
86222f29
...
@@ -333,8 +333,8 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
...
@@ -333,8 +333,8 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
}
}
vo
.
setOrderType
(
order
.
getOrderType
());
vo
.
setOrderType
(
order
.
getOrderType
());
}
else
{
}
else
{
vo
.
setOrderTimeType
(
0
);
vo
.
setOrderTimeType
(
2
);
vo
.
setOrderTime
(
0
L
);
vo
.
setOrderTime
(
3
L
);
}
}
voList
.
add
(
vo
);
voList
.
add
(
vo
);
});
});
...
...
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