Browse Source

1、bug修复

master
Aug 2 weeks ago
parent
commit
5052229565
2 changed files with 5 additions and 5 deletions
  1. +2
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java
  2. +3
    -3
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java

+ 2
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java View File

@ -84,8 +84,8 @@ public class OrderController {
//核销订单列表
@ApiOperation(value="订单-核销订单列表", notes="订单-核销订单列表")
@RequestMapping(value = "/overOrderList", method = {RequestMethod.POST})
public Result<?> overOrderList(@RequestHeader("X-Access-Token") String token, String userTime, PageBean pageBean){
return orderService.overOrderList(token, userTime, pageBean);
public Result<?> overOrderList(@RequestHeader("X-Access-Token") String token, String useTime, PageBean pageBean){
return orderService.overOrderList(token, useTime, pageBean);
}
//核销订单列表


+ 3
- 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java View File

@ -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());


Loading…
Cancel
Save