diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java index 717cb0c..8945e82 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/order/user/OrderUserQueryController.java @@ -46,10 +46,9 @@ public class OrderUserQueryController { @ApiOperation("客户获取订单记录分页列表") public QnPage userUserOrderRecord(PageUtil pageUtil, @RequestParam("miId") Long miId, - @RequestParam("userId") Long userId, - @RequestHeader(name = RequestHeaderFields.FIELD_ORGANIZATION_ID) Long orgId) { + @RequestParam("userId") Long userId) { - return orderQueryService.userUserOrderRecord(pageUtil,miId,userId,orgId); + return orderQueryService.userUserOrderRecord(pageUtil,miId,userId); } } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java index b37d489..f35e01e 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/OrderQueryService.java @@ -21,5 +21,5 @@ public interface OrderQueryService { boolean checkDiffSpecRight(Order order, OrderItem orderItem, ProductSpec productSpec); - QnPage userUserOrderRecord(PageUtil pageUtil,Long miId,Long userId,Long orgId); + QnPage userUserOrderRecord(PageUtil pageUtil,Long miId,Long userId); } diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java index f4c5cde..af47545 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/query/order/impl/OrderQueryServiceImpl.java @@ -78,7 +78,7 @@ public class OrderQueryServiceImpl implements OrderQueryService { } @Override - public QnPage userUserOrderRecord(PageUtil pageUtil, Long miId, Long userId, Long orgId) { + public QnPage userUserOrderRecord(PageUtil pageUtil, Long miId, Long userId) { return PageUtil.convert(orderViewDao.userUserOrderRecord(pageUtil.toPageWithoutOrders(),miId,userId)); } }