From cdf62a17dafecaeed948cf99a6913fd3a46fb773 Mon Sep 17 00:00:00 2001 From: tangqian Date: Fri, 16 Jun 2023 17:42:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E6=8E=A8=E5=B9=BF=E5=91=98=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/shop/service/recharge/RechargeOrderServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index 8c1d2f419..7216fc045 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -170,7 +170,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { if (promoterDrawVO.getOrderCount() == null) { promoterDrawVO.setOrderCount(new BigDecimal(0)); } - promoterDrawVO.setDrawAmount(NumberUtil.mul(promoterDrawVO.getDealAmount(), NumberUtil.div(promoterDrawVO.getMemberCommission().toString(), "100"), 2)); + promoterDrawVO.setDrawAmount(NumberUtil.mul(promoterDrawVO.getDealAmount(), NumberUtil.div(promoterDrawVO.getMemberCommission().toString(), "100"))); // PromoterDrawVO promoterDrawNew = nameList.get(promoterDrawVO.getUserId()); // if (promoterDrawNew != null) { From 9c88d5c6e17f9bdcfe12a2e85d26eb18248d03a9 Mon Sep 17 00:00:00 2001 From: tangqian Date: Sat, 17 Jun 2023 16:42:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E6=8E=A8=E5=B9=BF=E5=91=98=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/shop/service/recharge/RechargeOrderServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index 7216fc045..3efa868ad 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -124,6 +124,9 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { @Override public PageResult getRechargeOrderPage(RechargeOrderPageReqVO pageReqVO) { Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + Long tenantId = TenantContextHolder.getTenantId(); + pageReqVO.setTenantId(tenantId); + rechargeOrderMapper.findListPage(page, pageReqVO); return new PageResult<>(page.getRecords(), page.getTotal()); }