|
|
@ -454,7 +454,7 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
|
|
|
|
//核销订单列表 |
|
|
|
@Override |
|
|
|
public Result<?> overOrderList(String token, String userTime, PageBean pageBean) { |
|
|
|
public Result<?> overOrderList(String token, String useTime, PageBean pageBean) { |
|
|
|
//权限验证 |
|
|
|
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); |
|
|
|
//HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919044608477175810"); |
|
|
@ -482,8 +482,8 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
query = massageOrderService |
|
|
|
.lambdaQuery(); |
|
|
|
//核销时间 |
|
|
|
if(StringUtils.isNotEmpty(userTime)){ |
|
|
|
query.like(MassageOrder::getUseTime, userTime); |
|
|
|
if(StringUtils.isNotEmpty(useTime)){ |
|
|
|
query.like(MassageOrder::getUseTime, useTime); |
|
|
|
} |
|
|
|
//核销店铺id |
|
|
|
query.eq(MassageOrder::getShopId, shop.getId()); |
|
|
|