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);