From e86610e2a256a50390e8b44115a0ff90f7729654 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 11 Jun 2025 14:08:01 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"##=20=E5=A5=96=E9=87=91=E6=8B=A8?= =?UTF-8?q?=E6=AF=94=E6=B1=87=E6=80=BB=E6=9C=8D=E5=8A=A1=E8=A1=A5=E8=B4=B4?= =?UTF-8?q?=E6=8B=A8=E6=AF=94=E8=B0=83=E6=95=B4=EF=BC=8C=E4=B8=8D=E7=AE=97?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=EF=BC=9B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 389d0684 --- .../com/hzs/member/statis/vo/CuBonusVertexStaticTotalVO.java | 5 ----- .../mapper/member/statis/CuBonusVertexStatisMapper.xml | 5 ++--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStaticTotalVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStaticTotalVO.java index 3bae362b..b36557fd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStaticTotalVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStaticTotalVO.java @@ -215,11 +215,6 @@ public class CuBonusVertexStaticTotalVO implements Serializable { */ private Integer pkVertex; - /** - * 注册金额(用于处理服务补贴波比使用) - */ - private BigDecimal regAmount; - /** * 注册新增PV MAIN_REG_PV */ diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml index d8b09064..dbd398b4 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml @@ -370,7 +370,6 @@ sum (cbs.REPUR_RANGE_BONUS) repurRangeBonus, sum (cbs.REPUR_ORG_BONUS) repurOrgBonus, sum (cbs.REPUR_LEADER_BONUS) repurLeaderBonus, - sum (cbs.MAIN_REG_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT) regAmount, sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT) AS firstPurchaseAll, @@ -556,10 +555,10 @@ / sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT), 4) end AS leaderBonusRate, case - WHEN sum(cbs.MAIN_REG_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT) = 0 + WHEN sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT) = 0 THEN 0 ELSE ROUND(#{perCent} * sum(cbs.SERVICE_BONUS) - / sum(cbs.MAIN_REG_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT), 4) + / sum(cbs.MAIN_REG_AMOUNT + cbs.MAIN_UP_AMOUNT + cbs.SPECIAL_REGISTER_AMOUNT + cbs.SPECIAL_UPGRADE_AMOUNT + cbs.FICTITIOUS_AMOUNT), 4) end AS serviceBonusRate, case