From dd8751813ac2e5d819dfbf15702a8b5b654f7f76 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Sat, 17 May 2025 13:56:40 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=8B=A8=E6=AF=94=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=8B=93=E5=B1=95=E4=B8=9A?=
 =?UTF-8?q?=E7=BB=A9=E6=95=B0=E6=8D=AE=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CuBonusStatisServiceImpl.java        |  4 +
 .../impl/CuBonusVertexStatisServiceImpl.java  |  2 +
 .../hzs/member/statis/vo/CuBonusStatisVO.java |  9 ++
 .../statis/vo/CuBonusVertexStatisVO.java      | 13 +--
 .../member/statis/CuBonusStatisMapper.xml     | 15 ++--
 .../statis/CuBonusVertexStatisMapper.xml      | 86 +++----------------
 .../domain/member/statis/CuBonusStatis.java   | 12 +++
 .../member/statis/CuBonusVertexStatis.java    | 12 +++
 8 files changed, 67 insertions(+), 86 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java
index b88b4b88..29b868b8 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusStatisServiceImpl.java
@@ -191,6 +191,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
             case EXPANSION_INCOME:
                 // 拓展收益
                 oldBon.setOrgBonus(addOrInitializeAmount(oldBon.getOrgBonus(), newBon.getRealIncome(), 2));
+                oldBon.setCalFirAchieve(addOrInitializeAmount(oldBon.getCalFirAchieve(), newBon.getCalFirAchieve(), 2));
+                oldBon.setCalRepAchieve(addOrInitializeAmount(oldBon.getCalRepAchieve(), newBon.getCalRepAchieve(), 2));
                 break;
             case COACHING_INCOME:
                 // 辅导收益
@@ -256,6 +258,8 @@ public class CuBonusStatisServiceImpl extends ServiceImpl<CuBonusStatisMapper, C
             bs.setMakerShare(cb.getMakerShare());
             bs.setCloudAgentFirstPurchase(cb.getCloudAgentFirstPurchase());
             bs.setCloudAgentRepurchase(cb.getCloudAgentRepurchase());
+            bs.setCalFirAchieve(cb.getCalFirAchieve());
+            bs.setCalRepAchieve(cb.getCalRepAchieve());
 
             // 查询数据库判断记录是否存在
             List<CuBonusStatis> existingRecord = getCuBonusStatis(bs);
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java
index 72fe07d2..c4c95cfd 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/service/impl/CuBonusVertexStatisServiceImpl.java
@@ -235,6 +235,8 @@ public class CuBonusVertexStatisServiceImpl extends ServiceImpl<CuBonusVertexSta
             case EXPANSION_INCOME:
                 // 拓展收益
                 oldBon.setOrgBonus(addOrInitializeAmount(oldBon.getOrgBonus(), newBon.getRealIncome(), 2));
+                oldBon.setCalFirAchieve(addOrInitializeAmount(oldBon.getCalFirAchieve(), newBon.getCalFirAchieve(), 2));
+                oldBon.setCalRepAchieve(addOrInitializeAmount(oldBon.getCalRepAchieve(), newBon.getCalRepAchieve(), 2));
                 break;
             case COACHING_INCOME:
                 // 辅导收益
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java
index c0378e48..649eb839 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusStatisVO.java
@@ -788,5 +788,14 @@ public class CuBonusStatisVO {
      */
     private BigDecimal energySub = new BigDecimal(0);
 
+    /**
+     * 拓展首购金额
+     */
+    private BigDecimal calFirAchieve;
+    /**
+     * 拓展复购金额
+     */
+    private BigDecimal calRepAchieve;
+
 
 }
diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java
index 6ff318e2..e06f860c 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/vo/CuBonusVertexStatisVO.java
@@ -10,14 +10,9 @@ import java.util.Date;
 import java.util.List;
 
 /**
- * <p>
  * 奖金拨比统计
  * 每个团队，每天一条数据
  * 数据来自 订单表奖金明细表 会员奖金-会员奖金汇总表
- * </p>
- *
- * @author zhangjing
- * @since 2023-05-31
  */
 @Data
 public class CuBonusVertexStatisVO {
@@ -743,5 +738,13 @@ public class CuBonusVertexStatisVO {
      */
     private int period;
 
+    /**
+     * 拓展首购金额
+     */
+    private BigDecimal calFirAchieve;
+    /**
+     * 拓展复购金额
+     */
+    private BigDecimal calRepAchieve;
 
 }
diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml
index 96095188..e1dc373b 100644
--- a/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml
+++ b/bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml
@@ -1234,7 +1234,8 @@
         sum(mbp.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         cm.PK_VERTEX pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime,
+        0, 0
         from cu_member_bonus_push mbp
         inner join CU_MEMBER_BONUS cmb on mbp.PK_BONUS = cmb.pk_id
         inner join cu_member cm on cm.pk_id = cmb.pk_member
@@ -1261,7 +1262,8 @@
         sum(mbe.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         cm.PK_VERTEX pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime,
+        sum(mbe.cal_fir_achieve) cal_fir_achieve, sum(mbe.cal_rep_achieve) cal_rep_achieve
         from CU_MEMBER_BONUS_EXPAND mbe
         INNER JOIN CU_MEMBER_BONUS cmb on mbe.PK_BONUS = cmb.pk_id
         INNER join cu_member cm on cm.pk_id = cmb.pk_member
@@ -1289,7 +1291,8 @@
         sum(mbc.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         cm.PK_VERTEX pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime,
+        0, 0
         from CU_MEMBER_BONUS_COACH mbc
         inner join CU_MEMBER_BONUS cmb on mbc.PK_BONUS = cmb.pk_id
         inner join cu_member cm on cm.pk_id = cmb.pk_member
@@ -1317,7 +1320,8 @@
         sum(mbr.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         cm.PK_VERTEX pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime,
+        0, 0
         from cu_member_bonus_range mbr
         INNER JOIN CU_MEMBER_BONUS cmb on mbr.PK_BONUS=cmb.pk_id
         INNER join cu_member cm on cm.pk_id = cmb.pk_member
@@ -1344,7 +1348,8 @@
         sum(mbd.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         cm.PK_VERTEX pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime,
+        0, 0
         from cu_member_bonus_detail mbd
         INNER JOIN CU_MEMBER_BONUS cmb on mbd.PK_BONUS=cmb.pk_id
         INNER join cu_member cm on cm.pk_id = cmb.pk_member
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 6299fa12..ab964150 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
@@ -2,77 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hzs.member.statis.mapper.CuBonusVertexStatisMapper">
 
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.hzs.common.domain.member.statis.CuBonusVertexStatis">
-        <id column="PK_ID" property="pkId"/>
-        <result column="CREATION_TIME" property="creationTime"/>
-        <result column="PK_COUNTRY" property="pkCountry"/>
-        <result column="DEL_FLAG" property="delFlag"/>
-        <result column="STATIS_TYPE" property="statisType"/>
-        <result column="PERIOD" property="period"/>
-        <result column="START_DATE" property="startDate"/>
-        <result column="END_DATE" property="endDate"/>
-        <result column="MAIN_REG_AMOUNT" property="mainRegAmount"/>
-        <result column="MAIN_UP_AMOUNT" property="mainUpAmount"/>
-        <result column="MAIN_REPUR_AMOUNT" property="mainRepurAmount"/>
-        <result column="HIFANS_REG_AMOUNT" property="hifansRegAmount"/>
-        <result column="INTRODUCE_BONUS" property="introduceBonus"/>
-        <result column="ORG_BONUS" property="orgBonus"/>
-        <result column="LEADER_BONUS" property="leaderBonus"/>
-        <result column="SHARE_BONUS" property="shareBonus"/>
-        <result column="SERVICE_BONUS" property="serviceBonus"/>
-        <result column="HI_FUN_INCOME" property="hiFunIncome"/>
-        <result column="REPUR_RANGE_BONUS" property="repurRangeBonus"/>
-        <result column="REPUR_ORG_BONUS" property="repurOrgBonus"/>
-        <result column="MAIN_BONUS" property="mainBonus"/>
-        <result column="REPUR_BONUS" property="repurBonus"/>
-        <result column="PK_BD_VERTEX" property="pkBdVertex"/>
-        <result column="PK_TEAM_CODE" property="pkTeamCode"/>
-        <result column="HAI_FUN_INCOME" property="haiFunIncome"/>
-        <result column="GIFT_ORDER" property="giftOrder"/>
-        <result column="SPECIAL_REGISTER_AMOUNT" property="specialRegisterAmount"/>
-        <result column="SPECIAL_UPGRADE_AMOUNT" property="specialUpgradeAmount"/>
-        <result column="CLOUD_COLLEGE_AMOUNT" property="cloudCollegeAmount"/>
-        <result column="MALL_AMOUNT" property="mallAmount"/>
-        <result column="MAKER_GIFT_AMOUNT" property="makerGiftAmount"/>
-        <result column="EMPOWERMENT_GIFT_AMOUNT" property="empowermentGiftAmount"/>
-        <result column="COOPERATE_AMOUNT" property="cooperateAmount"/>
-        <result column="SPECIAL_REPURCHASE_AMOUNT" property="specialRepurchaseAmount"/>
-        <result column="HAI_FUN_UPGRADE_AMOUNT" property="haiFunUpgradeAmount"/>
-        <result column="REPUR_PUSH_INCOME" property="repurPushIncome"/>
-        <result column="MAKER_DIRECT" property="makerDirect"/>
-        <result column="MAKER_SHARE" property="makerShare"/>
-        <result column="THIRD_ORDER" property="thirdOrder"/>
-        <result column="FICTITIOUS_AMOUNT" property="fictitiousAmount"/>
-        <result column="MAKER_ORDER" property="makerOrder"/>
-        <result column="WELFARE_ORDER" property="welfareOrder"/>
-        <result column="MAIN_REG_PV" property="mainRegPv"/>
-        <result column="MAIN_UP_PV" property="mainUpPv"/>
-        <result column="MAIN_REPUR_PV" property="mainRepurPv"/>
-        <result column="SPECIAL_REGISTER_PV" property="specialRegisterPv"/>
-        <result column="SPECIAL_UPGRADE_PV" property="specialUpgradePv"/>
-        <result column="SPECIAL_REPURCHASE_PV" property="specialRepurchasePv"/>
-        <result column="FICTITIOUS_PV" property="fictitiousPv"/>
-        <result column="HIFANS_REG_PV" property="hifansRegPv"/>
-        <result column="HAI_FUN_UPGRADE_PV" property="haiFunUpgradePv"/>
-        <result column="CLOUD_COLLEGE_PV" property="cloudCollegePv"/>
-        <result column="MALL_PV" property="mallPv"/>
-        <result column="EMPOWERMENT_GIFT_PV" property="empowermentGiftPv"/>
-        <result column="COOPERATE_PV" property="cooperatePv"/>
-        <result column="MAKER_ORDER_PV" property="makerOrderPv"/>
-        <result column="MAKER_GIFT_PV" property="makerGiftPv"/>
-        <result column="WELFARE_ORDER_PV" property="welfareOrderPv"/>
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        CREATION_TIME
-        ,
-        PK_COUNTRY,
-        DEL_FLAG,
-        PK_ID, STATIS_TYPE, PERIOD, START_DATE, END_DATE, MAIN_REG_AMOUNT, MAIN_UP_AMOUNT, MAIN_REPUR_AMOUNT, HIFANS_REG_AMOUNT, INTRODUCE_BONUS, ORG_BONUS, LEADER_BONUS, SHARE_BONUS, SERVICE_BONUS, HI_FUN_INCOME, REPUR_RANGE_BONUS, REPUR_ORG_BONUS, MAIN_BONUS, REPUR_BONUS, PK_BD_VERTEX, PK_TEAM_CODE, HAI_FUN_INCOME, GIFT_ORDER, SPECIAL_REGISTER_AMOUNT, SPECIAL_UPGRADE_AMOUNT, CLOUD_COLLEGE_AMOUNT, MALL_AMOUNT, MAKER_GIFT_AMOUNT, EMPOWERMENT_GIFT_AMOUNT, COOPERATE_AMOUNT, SPECIAL_REPURCHASE_AMOUNT, HAI_FUN_UPGRADE_AMOUNT, REPUR_PUSH_INCOME, MAKER_DIRECT, MAKER_SHARE, THIRD_ORDER, FICTITIOUS_AMOUNT, MAKER_ORDER, WELFARE_ORDER, MAIN_REG_PV, MAIN_UP_PV, MAIN_REPUR_PV, SPECIAL_REGISTER_PV, SPECIAL_UPGRADE_PV, SPECIAL_REPURCHASE_PV, FICTITIOUS_PV, HIFANS_REG_PV, HAI_FUN_UPGRADE_PV, CLOUD_COLLEGE_PV, MALL_PV, EMPOWERMENT_GIFT_PV, COOPERATE_PV, MAKER_ORDER_PV, MAKER_GIFT_PV, WELFARE_ORDER_PV
-    </sql>
-
     <!--    奖金拨比列表-->
     <select id="queryCuBonusStatis" parameterType="com.hzs.member.statis.vo.CuBonusVertexStatisVO"
             resultType="com.hzs.member.statis.vo.CuBonusVertexStatisVO">
@@ -1124,7 +1053,8 @@
         sum(mbp.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         #{pkVertex} pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime,
+        0, 0
         from cu_member_bonus_push mbp
         INNER JOIN CU_MEMBER_BONUS cmb on mbp.PK_BONUS = cmb.pk_id
         INNER join (
@@ -1156,7 +1086,8 @@
         sum(mbe.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         #{pkVertex} pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'),'yyyy-mm-dd') AS creationTime,
+        sum(mbe.cal_fir_achieve) cal_fir_achieve, sum(mbe.cal_rep_achieve) cal_rep_achieve
         from CU_MEMBER_BONUS_EXPAND mbe
         INNER JOIN CU_MEMBER_BONUS cmb on mbe.PK_BONUS=cmb.pk_id
         INNER join ( SELECT pk_member
@@ -1188,7 +1119,8 @@
         sum(mbc.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         #{pkVertex} pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime,
+        0, 0
         from CU_MEMBER_BONUS_COACH mbc
         INNER JOIN CU_MEMBER_BONUS cmb on mbc.PK_BONUS=cmb.pk_id
         INNER join ( SELECT pk_member
@@ -1220,7 +1152,8 @@
         sum(mbr.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         #{pkVertex} pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime,
+        0, 0
         from cu_member_bonus_range mbr
         INNER JOIN CU_MEMBER_BONUS cmb on mbr.PK_BONUS=cmb.pk_id
         INNER join ( SELECT pk_member
@@ -1251,7 +1184,8 @@
         sum(mbd.REAL_INCOME) realIncome,
         bbi.BONUS_VALUE bonusType,
         #{pkVertex} pkVertex,
-        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime
+        to_date(to_char(so.PAY_TIME, 'yyyy-mm-dd'), 'yyyy-mm-dd') AS creationTime,
+        0, 0
         from cu_member_bonus_detail mbd
         INNER JOIN CU_MEMBER_BONUS cmb on mbd.PK_BONUS=cmb.pk_id
         INNER join ( SELECT pk_member
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusStatis.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusStatis.java
index cb9463d0..14f0a747 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusStatis.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusStatis.java
@@ -459,5 +459,17 @@ public class CuBonusStatis extends BaseEntity {
     @TableField("WELFARE_ORDER_PV")
     private BigDecimal welfareOrderPv;
 
+    /**
+     * 拓展首购业绩
+     */
+    @TableField("CAL_FIR_ACHIEVE")
+    private BigDecimal calFirAchieve;
+
+    /**
+     * 拓展复购业绩
+     */
+    @TableField("CAL_REP_ACHIEVE")
+    private BigDecimal calRepAchieve;
+
 
 }
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusVertexStatis.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusVertexStatis.java
index 8dbc7e9d..004f18aa 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusVertexStatis.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/statis/CuBonusVertexStatis.java
@@ -376,4 +376,16 @@ public class CuBonusVertexStatis extends BaseEntity {
     private BigDecimal LenjoyPv;
 
 
+    /**
+     * 拓展首购业绩
+     */
+    @TableField("CAL_FIR_ACHIEVE")
+    private BigDecimal calFirAchieve;
+
+    /**
+     * 拓展复购业绩
+     */
+    @TableField("CAL_REP_ACHIEVE")
+    private BigDecimal calRepAchieve;
+
 }