From 9ed8555c1058c6df255676b726f83a0ba7a87832 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 21 Aug 2025 10:15:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?##=20=E5=8D=87=E7=BA=A7=E4=B8=93=E5=8C=BA?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=9B=B4=E6=8E=A5=E5=8D=87=E7=BA=A7=E5=88=B0?= =?UTF-8?q?=E8=91=A3=E4=BA=8B=E4=BB=A3=E7=90=86=EF=BC=8C=E5=8F=AA=E8=83=BD?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B0=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=90=86?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SaOrderServiceImpl.java | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java index 09930e71..25a3aee0 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java @@ -2201,23 +2201,10 @@ public class SaOrderServiceImpl extends ServiceImpl impl .max(Comparator.comparingInt(BdGrade::getGradeValue)).get(); } else { // 非注册处理 -// if (checkUpgrade) { -// // 当前等级大于等于V3 或 盒数商品为0，则直接返回当前等级 -// if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0 -// || boxTotal == 0) { -// return memberGrade; -// } -// } else { -// // 当前等级大于V3 或 盒数商品为0，则直接返回当前等级 -// if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) > 0 -// || boxTotal == 0) { -// return memberGrade; -// } -// } - // 查询等级比现在当前等级大的 并且 排除高级店主，然后倒序排序，再查询 购买盒数 <= 等级盒数 的第一个等级，就是当前升级的等级 Optional gradeOptional = gradeList.stream() - .filter(tmpGrade -> tmpGrade.getGradeValue() != EGrade.S_VIP.getValue() && tmpGrade.getGradeValue() > memberGrade.getGradeValue()) + .filter(tmpGrade -> tmpGrade.getGradeValue() != EGrade.S_VIP.getValue() && tmpGrade.getGradeValue() != EGrade.DIRECTOR.getValue() + && tmpGrade.getGradeValue() > memberGrade.getGradeValue()) .sorted(Comparator.comparingInt(BdGrade::getGradeValue).reversed()) .filter(tmpGrade -> tmpGrade.getBoxNumber().compareTo(BigDecimal.ZERO) > 0) .filter(tmpGrade -> tmpGrade.getBoxNumber().compareTo(boxTotal) <= 0).findFirst(); @@ -2238,7 +2225,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl */ @Override public BigDecimal handleBaseBoxNum(CuMember cuMember, BdGrade memberGrade, List gradeList, List boxWaresList, - Integer systemType) { + Integer systemType) { // 升级盒数基数 BigDecimal baseBoxNum = BigDecimal.ZERO; // 会员所有升级记录 From b376571da25de842aa32fc044097c27ec947aecd Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Thu, 21 Aug 2025 10:18:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?##=20=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E5=8C=BA=E5=9F=9F=E4=BB=A3=E7=90=86=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=8D=87=E7=BA=A7=E8=91=A3=E4=BA=8B=E4=BB=A3=E7=90=86?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CuMemberBusinessServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java index 774276d1..27edfd3a 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberBusinessServiceImpl.java @@ -1605,12 +1605,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { if (null == gradeDTO) { gradeDTO = iGradeServiceApi.getGrade(cuMember.getPkSettleGrade()).getData(); } - if (gradeDTO.getGradeValue() >= EGrade.VIP.getValue()) { - // 会员等级大于等于 博羚店主，推荐人如果也是博羚店主，需要升级为高级店主 - CuMember parentMember = iCuMemberService.getShopkeeperMember(cuMember.getPkParent(), EGrade.VIP.getValue()); + if (gradeDTO.getGradeValue() >= EGrade.REGION.getValue()) { + // 会员等级大于等于 区域代理，推荐人如果也是区域代理，需要升级为董事代理 + CuMember parentMember = iCuMemberService.getShopkeeperMember(cuMember.getPkParent(), EGrade.REGION.getValue()); if (null != parentMember) { // 记录升级历史 - GradeDTO upgradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), cuMember.getPkSettleCountry()).getData(); + GradeDTO upgradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.DIRECTOR.getValue(), cuMember.getPkSettleCountry()).getData(); CuMemberLevel cuMemberLevel = CuMemberLevel.builder() .pkMember(parentMember.getPkId()) .upType(EUpgradeType.AUTO_UPGRADE.getValue()) @@ -1630,12 +1630,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { updateWrapper.set(CuMember::getModifiedTime, new Date()); iCuMemberService.update(updateWrapper); } - } else if (gradeDTO.getGradeValue() >= EGrade.REGION.getValue()) { - // 会员等级大于等于 区域代理，推荐人如果也是区域代理，需要升级为董事代理 - CuMember parentMember = iCuMemberService.getShopkeeperMember(cuMember.getPkParent(), EGrade.REGION.getValue()); + } else if (gradeDTO.getGradeValue() >= EGrade.VIP.getValue()) { + // 会员等级大于等于 博羚店主，推荐人如果也是博羚店主，需要升级为高级店主 + CuMember parentMember = iCuMemberService.getShopkeeperMember(cuMember.getPkParent(), EGrade.VIP.getValue()); if (null != parentMember) { // 记录升级历史 - GradeDTO upgradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.DIRECTOR.getValue(), cuMember.getPkSettleCountry()).getData(); + GradeDTO upgradeDTO = iGradeServiceApi.getGradeByGradeValue(EGrade.S_VIP.getValue(), cuMember.getPkSettleCountry()).getData(); CuMemberLevel cuMemberLevel = CuMemberLevel.builder() .pkMember(parentMember.getPkId()) .upType(EUpgradeType.AUTO_UPGRADE.getValue())