diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 83d2180e5..c427ad022 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -62,7 +62,7 @@ public class OrderBasicInfoController extends BaseController { dto.setMerchantId(String.valueOf(pileMerchantInfo.getId())); } startPage(); - List list = orderBasicInfoService.selectOrderBasicInfoList(dto); + List list = orderBasicInfoService.selectOrderBasicInfoListWithAuth(dto); return getDataTable(list); } @@ -106,7 +106,7 @@ public class OrderBasicInfoController extends BaseController { if (pileMerchantInfo != null) { orderBasicInfo.setMerchantId(String.valueOf(pileMerchantInfo.getId())); } - List list = orderBasicInfoService.selectOrderBasicInfoList(orderBasicInfo); + List list = orderBasicInfoService.selectOrderBasicInfoListWithAuth(orderBasicInfo); ExcelUtil util = new ExcelUtil(OrderListVO.class); util.exportExcel(response, list, "订单数据"); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java index 1fdaedd6f..ad3ffab0c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java @@ -41,6 +41,8 @@ public interface IOrderBasicInfoService { */ OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info); + List selectOrderBasicInfoListWithAuth(QueryOrderDTO dto); + /** * 查询订单列表 * diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index e26cf1b1f..e393c7a64 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -183,13 +183,12 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 查询订单列表 - * + * 带权限过滤 * @param dto 订单 * @return 订单 */ @Override - // @DataScope(deptAlias = "t3") - public List selectOrderBasicInfoList(QueryOrderDTO dto) { + public List selectOrderBasicInfoListWithAuth(QueryOrderDTO dto) { // 权限过滤 AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); if (authorizedMap == null) { @@ -198,6 +197,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } dto.setStationDeptIds(authorizedMap.getStationDeptIds()); dto.setMerchantDeptIds(authorizedMap.getMerchantDeptIds()); + return selectOrderBasicInfoList(dto); + } + + /** + * 查询订单列表 + * 无权限过滤 + * @param dto 订单 + * @return 订单 + */ + @Override + public List selectOrderBasicInfoList(QueryOrderDTO dto) { List orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto); if (CollectionUtils.isEmpty(orderListVOS)) { return orderListVOS; @@ -246,10 +256,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { if (orderAmount.compareTo(BigDecimal.ZERO) > 0) { if (StringUtils.equals(orderListVO.getPayMode(), OrderPayModeEnum.PAYMENT_OF_BALANCE.getValue())) { - /* - 余额支付 查询支付记录,如全部用本金支付,则虚拟金额为0,结算金额为订单消费金额, - 如果使用了赠送金额,虚拟金额为赠送金额支付部分,结算金额=订单消费金额-虚拟金额消费部分 - */ + /* + 余额支付 查询支付记录,如全部用本金支付,则虚拟金额为0,结算金额为订单消费金额, + 如果使用了赠送金额,虚拟金额为赠送金额支付部分,结算金额=订单消费金额-虚拟金额消费部分 + */ // 查询支付记录 List orderPayRecordList = orderPayRecordService.getOrderPayRecordList(orderListVO.getOrderCode()); for (OrderPayRecord orderPayRecord : orderPayRecordList) { @@ -269,9 +279,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } } } else { - /* - 微信支付 虚拟金额为0 结算金额等于订单消费金额 - */ + /* + 微信支付 虚拟金额为0 结算金额等于订单消费金额 + */ settleAmount = orderAmount; } }