From 94baf2e587c981aad47dc7ed1daaf74ab3fe1ab2 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 22 Dec 2025 09:50:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/user/UPpPackageController.java | 2 +- .../src/main/resources/mapper/PpPackageOrderMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java index 048d687c9..68a3e5574 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java @@ -72,7 +72,7 @@ public class UPpPackageController { */ @GetMapping("/order") public CzgResult> getMyOrderList(GbOrderQueryParam reqVo) { - return CzgResult.success(ppPackageOrderService.queryOrderList(null, StpKit.USER.getLoginIdAsLong(), reqVo)); + return CzgResult.success(ppPackageOrderService.queryOrderList(reqVo.getShopId(), StpKit.USER.getLoginIdAsLong(), reqVo)); } /** diff --git a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml index ee356758d..489fc33e2 100644 --- a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml @@ -17,10 +17,10 @@ left join tb_user_info u on o.user_id = u.id where 1=1 - and o.shop_id = #{shopId} and o.status != 'ing' + and o.shop_id = #{shopId} - and o.user_id = #{userId} + and o.user_id = #{userId} and o.status != 'ing' and o.order_no = #{param.orderNo}