Merge remote-tracking branch 'origin/lx_dev' into lx_dev

## 领导奖左右区判断业绩重复字段修改；
2025-10-10 15:50:00 +08:00 · 2025-10-10 15:49:56 +08:00
1 changed files with 3 additions and 3 deletions
--- a/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
+++ b/bd-business/bd-business-bonus/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml
@ -1213,13 +1213,13 @@
        select t.*,
        nvl(cms.a_balance, 0) a_balance,
        nvl(cms.b_balance, 0) b_balance,
-        nvl(t.a_sum_pv, 0) + nvl(t.rep_a_sum_pv, 0) - nvl(cms.a_sum_pv, 0) - nvl(cms.rep_a_sum_pv, 0) a_sum_pv,
-        nvl(t.b_sum_pv, 0) + nvl(t.rep_b_sum_pv, 0) - nvl(cms.b_sum_pv, 0) - nvl(cms.rep_b_sum_pv, 0) b_sum_pv
+        nvl(t.tmp_a_sum_pv, 0) + nvl(t.rep_a_sum_pv, 0) - nvl(cms.a_sum_pv, 0) - nvl(cms.rep_a_sum_pv, 0) a_sum_pv,
+        nvl(t.tmp_b_sum_pv, 0) + nvl(t.rep_b_sum_pv, 0) - nvl(cms.b_sum_pv, 0) - nvl(cms.rep_b_sum_pv, 0) b_sum_pv
        from (
        select cms.*, ba.awards_value
        from (
        select cms.pk_member, cms.pk_awards, cms.purchase_status,
-        cms.a_sum_pv, cms.b_sum_pv,
+        cms.a_sum_pv tmp_a_sum_pv, cms.b_sum_pv tmp_b_sum_pv,
        cms.rep_a_sum_pv, cms.rep_b_sum_pv
        from ${settleTableName} cms
        where cms.pk_member in
Author	SHA1	Message	Date
cabbage	45beb6e846	Merge remote-tracking branch 'origin/lx_dev' into lx_dev	2025-10-10 15:50:00 +08:00
cabbage	38f0668d99	## 领导奖左右区判断业绩重复字段修改；	2025-10-10 15:49:56 +08:00