diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtRefundController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtRefundController.java index 3ff33db..84e88ab 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtRefundController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/EtRefundController.java @@ -42,7 +42,7 @@ public class EtRefundController extends BaseController public TableDataInfo list(EtRefund etRefund) { startPage(); - List list = etRefundService.selectEtRefundList(etRefund); + List list = etRefundService.selectEtRefundListWithIsolate(etRefund); return getDataTable(list); } @@ -54,7 +54,7 @@ public class EtRefundController extends BaseController @PostMapping("/export") public void export(HttpServletResponse response, EtRefund etRefund) { - List list = etRefundService.selectEtRefundList(etRefund); + List list = etRefundService.selectEtRefundListWithIsolate(etRefund); ExcelUtil util = new ExcelUtil(EtRefund.class); util.exportExcel(response, list, "退款订单数据"); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IEtRefundService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IEtRefundService.java index e12b57a..a118429 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IEtRefundService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IEtRefundService.java @@ -43,6 +43,14 @@ public interface IEtRefundService */ public List selectEtRefundList(EtRefund etRefund); + /** + * 查询退款订单列表(带数据隔离) + * + * @param etRefund 退款订单 + * @return 退款订单集合 + */ + public List selectEtRefundListWithIsolate(EtRefund etRefund); + /** * 新增退款订单 * diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java index 8da4b6c..a844d35 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java @@ -219,7 +219,7 @@ public class EtOrderServiceImpl implements IEtOrderService } /** - * 查询充值/退款订单列表 资本 capital flow 收支 业务 + * 查询充值/退款订单列表 */ @Override @DataScope(deptAlias = "d") @@ -239,7 +239,7 @@ public class EtOrderServiceImpl implements IEtOrderService EtRefund refund = new EtRefund(); refund.setType(ServiceConstants.REFUND_TYPE_DEPOSIT); refund.setRefundResult(Constants.SUCCESS2); - List etRefunds = etRefundService.selectEtRefundList(refund); + List etRefunds = etRefundService.selectEtRefundListWithIsolate(refund); etRefunds.forEach(etRefund -> { AsUser asUser = asUserService.selectUserById(etRefund.getUserId()); RechargeVo rechargeVo = new RechargeVo(); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtRefundServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtRefundServiceImpl.java index 57f3c73..e5bba6a 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtRefundServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtRefundServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service.impl; import java.util.List; + +import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -69,6 +71,19 @@ public class EtRefundServiceImpl implements IEtRefundService return etRefundMapper.selectEtRefundList(etRefund); } + /** + * 查询退款订单列表 + * + * @param etRefund 退款订单 + * @return 退款订单 + */ + @DataScope(deptAlias = "d") + @Override + public List selectEtRefundListWithIsolate(EtRefund etRefund) + { + return etRefundMapper.selectEtRefundList(etRefund); + } + /** * 新增退款订单 * diff --git a/electripper-system/src/main/resources/mapper/system/EtRefundMapper.xml b/electripper-system/src/main/resources/mapper/system/EtRefundMapper.xml index 879a784..5f602ed 100644 --- a/electripper-system/src/main/resources/mapper/system/EtRefundMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtRefundMapper.xml @@ -26,16 +26,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"