From 39e3c584e0477f2b119595f66437987e71969b53 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Wed, 25 Jun 2025 10:42:17 +0800 Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20H5=E4=B8=AA=E4=BA=BA=E6=8B=93?= =?UTF-8?q?=E5=B1=95=E7=BB=93=E4=BD=99=E6=8E=A5=E5=8F=A3=20-=20=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/ApiMemberStructureController.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java index 2c1fbf8c..e631b199 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/structure/controller/api/ApiMemberStructureController.java @@ -670,11 +670,22 @@ public class ApiMemberStructureController extends BaseController { BigDecimal leftFirstSurplus = new BigDecimal(leftFirstSurplusStr.replaceAll(",", "")); BigDecimal rightFirstSurplus = new BigDecimal(rightFirstSurplusStr.replaceAll(",", "")); log.info("result : {}", JSONUtil.toJsonStr(result)); - if(leftFirstSurplus.compareTo(bdBonusExpand.getExpandSmall()) > 0){ - result.get(0).putExtra("leftFirstSurplus", bdBonusExpand.getExpandSmall().toString()); - } - if(rightFirstSurplus.compareTo(bdBonusExpand.getExpandBig()) > 0){ - result.get(0).putExtra("rightFirstSurplus", bdBonusExpand.getExpandBig().toString()); + if(leftFirstSurplus.compareTo(rightFirstSurplus) >= 0){ + // 左大右小 + if(leftFirstSurplus.compareTo(bdBonusExpand.getExpandSmall()) > 0){ + result.get(0).putExtra("leftFirstSurplus", bdBonusExpand.getExpandBig().toString()); + } + if(rightFirstSurplus.compareTo(bdBonusExpand.getExpandBig()) > 0){ + result.get(0).putExtra("rightFirstSurplus", bdBonusExpand.getExpandSmall().toString()); + } + }else{ + // 左小右大 + if(leftFirstSurplus.compareTo(bdBonusExpand.getExpandSmall()) > 0){ + result.get(0).putExtra("leftFirstSurplus", bdBonusExpand.getExpandSmall().toString()); + } + if(rightFirstSurplus.compareTo(bdBonusExpand.getExpandBig()) > 0){ + result.get(0).putExtra("rightFirstSurplus", bdBonusExpand.getExpandBig().toString()); + } } JSONObject data = new JSONObject(); data.put("tree", result);