From f0b1a12181e590e8e352e4c5de6d2883f2bc8cdd Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 28 May 2025 19:24:08 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=8B=A8=E6=AF=94=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=B0=83=E6=95=B4=EF=BC=88129=EF=BC=89?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CuBonusVertexStatisTotalController.java   | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java
index 88bd3a6d..32a60204 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java
@@ -74,11 +74,21 @@ public class CuBonusVertexStatisTotalController extends BaseController {
         CuBonusVertexStatisVO cvs = BeanUtil.copyProperties(cuBonusVertexStaticTotalVO, CuBonusVertexStatisVO.class);
         for (CuBonusVertexStaticTotalVO ve : vertexList) {
             cvs.setPkVertex(ve.getPkVertex());
+
+            CuBonusVertexStaticTotalVO mapTouch = new CuBonusVertexStaticTotalVO();
+            mapTouch.setPkVertex(ve.getPkVertex());
+            //查询顶点拓展封顶人数
+            CuBonusVertexStaticTotalVO orgTopNumber = iCuBonusVertexStatisService.queryOrgTopNumber(cvs);
+            if (orgTopNumber != null) {
+                mapTouch.setOrgTopNumber(orgTopNumber.getOrgTopNumber());
+            }
             //查询顶点拓展平均碰次和拓展最高碰次
             CuBonusVertexStaticTotalVO touch = iCuBonusVertexStatisService.queryTouch(cvs);
             if (touch != null) {
-                touchMap.put(ve.getPkVertex(), touch);
+                mapTouch.setOrgAvTouch(touch.getOrgAvTouch());
+                mapTouch.setOrgMaxTouch(touch.getOrgMaxTouch());
             }
+            touchMap.put(ve.getPkVertex(), mapTouch);
         }
 
         startPage();
@@ -144,11 +154,21 @@ public class CuBonusVertexStatisTotalController extends BaseController {
         CuBonusVertexStatisVO cvs = BeanUtil.copyProperties(cuBonusVertexStaticTotalVO, CuBonusVertexStatisVO.class);
         for (CuBonusVertexStaticTotalVO ve : vertexList) {
             cvs.setPkVertex(ve.getPkVertex());
+
+            CuBonusVertexStaticTotalVO mapTouch = new CuBonusVertexStaticTotalVO();
+            mapTouch.setPkVertex(ve.getPkVertex());
+            //查询顶点拓展封顶人数
+            CuBonusVertexStaticTotalVO orgTopNumber = iCuBonusVertexStatisService.queryOrgTopNumber(cvs);
+            if (orgTopNumber != null) {
+                mapTouch.setOrgTopNumber(orgTopNumber.getOrgTopNumber());
+            }
             //查询顶点拓展平均碰次和拓展最高碰次
             CuBonusVertexStaticTotalVO touch = iCuBonusVertexStatisService.queryTouch(cvs);
             if (touch != null) {
-                touchMap.put(ve.getPkVertex(), touch);
+                mapTouch.setOrgAvTouch(touch.getOrgAvTouch());
+                mapTouch.setOrgMaxTouch(touch.getOrgMaxTouch());
             }
+            touchMap.put(ve.getPkVertex(), mapTouch);
         }
 
         //查询顶点奖金拨比汇总