From df62c304d770c873b535d6088062205afcbd927e Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Sat, 5 Jul 2025 15:49:21 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E9=80=80=E6=AC=BE=E6=98=8E?= =?UTF-8?q?=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ApiOrderController.java | 10 ++++++++ .../hzs/sale/order/mapper/SaOrderMapper.java | 3 +++ .../sale/order/service/ISaOrderService.java | 2 ++ .../service/impl/SaOrderServiceImpl.java | 6 +++++ .../mapper/sale/order/SaOrderMapper.xml | 25 +++++++++++++++++++ 5 files changed, 46 insertions(+) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java index 50cac495..5824f6f0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/api/ApiOrderController.java @@ -19,6 +19,7 @@ import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrderItems; +import com.hzs.common.domain.third.pay.ext.TOnlineRefundExt; import com.hzs.common.security.auth.AuthMemberUtil; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.util.TransactionUtils; @@ -226,6 +227,15 @@ public class ApiOrderController extends BaseController { return tableDataInfo; } + @GetMapping("/refund-list") + public TableDataInfo refundList() { + // 返回结果 + startPage(); + List list = iSaOrderService.queryRefundList(); + TableDataInfo tableDataInfo = getDataTable(list); + tableDataInfo.setRows(list); + return tableDataInfo; + } /** * 订单详情 * diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java index 82e47fd0..01277657 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/mapper/SaOrderMapper.java @@ -5,6 +5,7 @@ import com.hzs.common.domain.sale.ext.SaDeliverItemsExt; import com.hzs.common.domain.sale.ext.SaOrderExt; import com.hzs.common.domain.sale.ext.SaOrderItemsExt; import com.hzs.common.domain.sale.order.SaOrder; +import com.hzs.common.domain.third.pay.ext.TOnlineRefundExt; import com.hzs.sale.deliver.param.DeliverSecondParam; import com.hzs.sale.deliver.vo.DeliverSecondVO; import com.hzs.sale.order.param.*; @@ -138,6 +139,8 @@ public interface SaOrderMapper extends BaseMapper { @Param("memberId") Long memberId, @Param("pkCountry") Integer pkCountry); + List queryRefundList(@Param("userId") Long userId); + /** * 自助撤单列表 **/ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java index 8c746058..e990a20f 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/ISaOrderService.java @@ -9,6 +9,7 @@ import com.hzs.common.domain.member.ext.CuMemberExt; import com.hzs.common.domain.sale.ext.*; import com.hzs.common.domain.sale.order.SaOrder; import com.hzs.common.domain.sale.order.SaOrderItems; +import com.hzs.common.domain.third.pay.ext.TOnlineRefundExt; import com.hzs.sale.deliver.param.DeliverSecondParam; import com.hzs.sale.deliver.vo.DeliverSecondVO; import com.hzs.sale.order.param.*; @@ -412,6 +413,7 @@ public interface ISaOrderService extends IService { */ List myOrderList(MyOrderParam param, Long memberId, Integer pkCountry); + List queryRefundList(); /** * 自助撤单列表 **/ diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 08830d3a..a0adb1da 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -37,6 +37,7 @@ import com.hzs.common.domain.system.base.BdCountry; import com.hzs.common.domain.system.base.ext.BdProductStorehouseExt; import com.hzs.common.domain.system.config.BdAwards; import com.hzs.common.domain.third.pay.TOnlinePayment; +import com.hzs.common.domain.third.pay.ext.TOnlineRefundExt; import com.hzs.common.security.service.UserTokenService; import com.hzs.common.security.utils.SecurityUtils; import com.hzs.common.util.TransactionUtils; @@ -1778,6 +1779,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl return baseMapper.myOrderList(param, memberId, pkCountry); } + @Override + public List queryRefundList() { + return baseMapper.queryRefundList(SecurityUtils.getUserId()); + } + /** * @description: 自助撤单列表 **/ diff --git a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml index 899f5834..574a9db6 100644 --- a/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml +++ b/bd-business/bd-business-sale/src/main/resources/mapper/sale/order/SaOrderMapper.xml @@ -1799,5 +1799,30 @@ on od.pk_rate = bc.pk_id order by pay_time +