Commit 86222f29 by 吕明尚

门店显示多少时间有人预定,默认为3小时前有人预定

parent 8d2f38b4
...@@ -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);
} }
......
...@@ -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(0L); vo.setOrderTime(3L);
} }
voList.add(vo); voList.add(vo);
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment