From 5052229565054bf14395fc6f1fa93f860e4857ca Mon Sep 17 00:00:00 2001 From: Aug <17674666882@163.com> Date: Mon, 19 May 2025 11:21:20 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/api/massageController/OrderController.java | 4 ++-- .../java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java index db71a6c..4a28722 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/massageController/OrderController.java @@ -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); } //核销订单列表 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java index f9a0ca4..aa7fe24 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java @@ -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());