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

bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java

@@ -101,20 +101,9 @@ public class CuBonusVertexStatisTotalController extends BaseController {
         startPage();
         //查询顶点奖金拨比汇总
         slList = iCuBonusVertexStatisService.queryCuBonusStatisTotal(cuBonusVertexStatisTotalVO);
-        //查询顶点奖金拨比汇总总和（最后一行）
-        CuBonusVertexStatisTotalVO cuBonusVertexStatisSum = iCuBonusVertexStatisService.queryCuBonusStatisSum(cuBonusVertexStatisTotalVO);
-        cuBonusVertexStatisSum.setMainBonus((cuBonusVertexStatisSum.getMainBonus()).multiply(currency.getData().getInExchangeRate()));
-        cuBonusVertexStatisSum.setRepurBonus(cuBonusVertexStatisSum.getRepurBonus().multiply(currency.getData().getInExchangeRate()));
         if (CollectionUtil.isNotEmpty(slList)) {
             slList.forEach(itm -> {
 
-//                if (itm.getPkVertex().equals(itmm.getPkVertex())) {
-//                    itm.setFirstPurchaseAll(itm.getFirstPurchaseAll().subtract(itmm.getOrderAmount()).add(itmm.getEnergySum()));
-//                    itm.setOrgTopNumber(itmm.getOrgTopNumber());
-//                    itm.setOrgAvTouch(itmm.getOrgAvTouch());
-//                    itm.setOrgMaxTouch(itmm.getOrgMaxTouch());
-//                }
-
                 //重新算首购拨比
                 if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0) {
                     BigDecimal mainBonusRate = cent.multiply((itm.getMainBonus()).multiply(currency.getData().getInExchangeRate()));
@@ -136,7 +125,14 @@ public class CuBonusVertexStatisTotalController extends BaseController {
                 itm.setFirstPurchaseRatio(cent.multiply(itm.getFirstPurchaseAll()).divide(cuBonusVertexStatisTotalVO.getFirstPurchaseAllSum(), 4, RoundingMode.HALF_UP));
             }
         });
-        cuBonusVertexStatisSum.setMemberName("汇总");
+
+        //查询顶点奖金拨比汇总总和（最后一行）
+        CuBonusVertexStatisTotalVO cuBonusVertexStatisSum = iCuBonusVertexStatisService.queryCuBonusStatisSum(cuBonusVertexStatisTotalVO);
+        if (null != cuBonusVertexStatisSum) {
+            cuBonusVertexStatisSum.setMainBonus((cuBonusVertexStatisSum.getMainBonus()).multiply(currency.getData().getInExchangeRate()));
+            cuBonusVertexStatisSum.setRepurBonus(cuBonusVertexStatisSum.getRepurBonus().multiply(currency.getData().getInExchangeRate()));
+            cuBonusVertexStatisSum.setMemberName("汇总");
+        }
         slList.add(cuBonusVertexStatisSum);
         return getDataTable(slList);
     }
@@ -199,14 +195,6 @@ public class CuBonusVertexStatisTotalController extends BaseController {
         cuBonusVertexStatisSum.setRepurBonus(cuBonusVertexStatisSum.getRepurBonus().multiply(currency.getData().getInExchangeRate()));
         if (CollectionUtil.isNotEmpty(slList)) {
             slList.forEach(itm -> {
-
-//                if (itm.getPkVertex().equals(itmm.getPkVertex())) {
-//                    itm.setFirstPurchaseAll(itm.getFirstPurchaseAll().subtract(itmm.getOrderAmount()).add(itmm.getEnergySum()));
-//                    itm.setOrgTopNumber(itmm.getOrgTopNumber());
-//                    itm.setOrgAvTouch(itmm.getOrgAvTouch());
-//                    itm.setOrgMaxTouch(itmm.getOrgMaxTouch());
-//                }
-
                 //重新算首购拨比
                 if (itm.getFirstPurchaseAll().compareTo(BigDecimal.ZERO) > 0) {
                     BigDecimal mainBonusRate = cent.multiply((itm.getMainBonus()).multiply(currency.getData().getInExchangeRate()));

bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusStatisMapper.xml

@@ -525,7 +525,6 @@
         sum (cbs.ORG_BONUS) orgBonusSum,
         sum (cbs.LEADER_BONUS) leaderBonusSum,
         #{orderAchieve} shareBonusSum,
-        #{energyAmountAll} energyAmountAllSum,
         sum (cbs.SERVICE_BONUS) serviceBonusSum,
         sum (cbs.HI_FUN_INCOME) hiFunIncomeSum,
         sum (cbs.REPUR_RANGE_BONUS) repurRangeBonusSum,
@@ -558,7 +557,7 @@
         ROUND(sum(#{perCent}*AGENT_REPUR_AMOUNT)/(sum(cbs.AGENT_REG_AMOUNT +
         cbs.AGENT_UP_AMOUNT+cbs.AGENT_REPUR_AMOUNT)),4) end as agentRepurAmountRateSum,
         ((sum(cbs.MAIN_REG_AMOUNT +
-        cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT))-#{energySub}+#{energySum}) AS
+        cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT))) AS
         firstPurchaseAllSum,
         ( sum(cbs.MAIN_REPUR_AMOUNT +
         cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
@@ -574,7 +573,7 @@
         = 0
         THEN 0 ELSE ROUND(((#{perCent}*sum(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS
         +cbs.MAKER_DIRECT+cbs.MAKER_SHARE)))
-        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)-#{energySub}+#{energySum}),4)
+        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)),4)
         end AS mainBonusRateSum,
 
         CASE WHEN
@@ -624,7 +623,7 @@
         (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT+
         cbs.MAIN_REPUR_AMOUNT+cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
         +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)-#{energySub}+#{energySum}),4) end AS totalBonusRateSum
+        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)),4) end AS totalBonusRateSum
         FROM
         CU_BONUS_STATIS cbs
         left join bd_vertex ver on cbs.pk_bd_vertex = ver.pk_id

bd-business/bd-business-member/src/main/resources/mapper/member/statis/CuBonusVertexStatisMapper.xml

@@ -418,7 +418,6 @@
         sum (cbs.INTRODUCE_BONUS) introduceBonus,
         sum (cbs.ORG_BONUS) orgBonus,
         sum (cbs.LEADER_BONUS) leaderBonus,
-        #{energyAmountAll} energyAmountAll,
         sum (cbs.SERVICE_BONUS) serviceBonus,
         CASE WHEN
         sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)
@@ -538,24 +537,23 @@
         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.INTRODUCE_BONUS)))
-        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)-#{energySub}),4)
+        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)),4)
         end AS introduceBonusRate,
         sum (cbs.ORG_BONUS) orgBonus,
         CASE 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.ORG_BONUS)))
-        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)-#{energySub}),4)
+        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)),4)
         end AS orgBonusRate,
 
         sum (cbs.LEADER_BONUS) leaderBonus,
-        #{energyAmountAll} energyAmountAll,
         sum (cbs.SERVICE_BONUS) serviceBonus,
         CASE 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.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)-#{energySub}),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,
         sum (cbs.HI_FUN_INCOME) hiFunIncome,
         sum (cbs.REPUR_RANGE_BONUS) repurRangeBonus,
@@ -566,10 +564,10 @@
         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.MAKER_DIRECT+cbs.MAKER_SHARE)))
-        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)-#{energySub}),4)
+        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)),4)
         end AS makerRate,
         ((sum(cbs.MAIN_REG_AMOUNT +
-        cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT))-#{energySub}) AS
+        cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT))) AS
         firstPurchaseAll,
         ( sum(cbs.MAIN_REPUR_AMOUNT +
         cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
@@ -582,7 +580,7 @@
         = 0
         THEN 0 ELSE ROUND(((#{perCent}*sum(cbs.INTRODUCE_BONUS+cbs.ORG_BONUS+cbs.LEADER_BONUS+cbs.SERVICE_BONUS
         +cbs.MAKER_DIRECT+cbs.MAKER_SHARE)))
-        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)-#{energySub}),4)
+        /(sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT)),4)
         end AS mainBonusRate,
 
         CASE WHEN
@@ -632,7 +630,7 @@
         (sum(cbs.MAIN_REG_AMOUNT+cbs.MAIN_UP_AMOUNT+cbs.SPECIAL_REGISTER_AMOUNT+cbs.SPECIAL_UPGRADE_AMOUNT+cbs.FICTITIOUS_AMOUNT+
         cbs.MAIN_REPUR_AMOUNT+cbs.HIFANS_REG_AMOUNT+cbs.HAI_FUN_UPGRADE_AMOUNT+cbs.CLOUD_COLLEGE_AMOUNT+cbs.MALL_AMOUNT
         +cbs.EMPOWERMENT_GIFT_AMOUNT+cbs.COOPERATE_AMOUNT+cbs.SPECIAL_REPURCHASE_AMOUNT
-        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)-#{energySub}+#{energySum}),4) end AS totalBonusRate
+        +cbs.MAKER_ORDER+cbs.MAKER_GIFT_AMOUNT+cbs.WELFARE_ORDER)),4) end AS totalBonusRate
         FROM
         CU_BONUS_VERTEX_STATIS cbs
         LEFT JOIN CU_MEMBER cm ON cm.PK_ID = cbs.PK_BD_VERTEX