From 8ddb794adad19d96c61656ba59e2f0516babc118 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Mon, 9 Jun 2025 15:48:48 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E5=A4=8D=E8=B4=AD=E3=80=81=E9=87=8D?= =?UTF-8?q?=E6=B6=88=E8=AE=A2=E5=8D=95=E4=B8=8B=E5=8D=95=E5=A4=84=E7=90=86?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CuMemberBusinessServiceImpl.java | 21 ++++++++++--------- .../api/ApiRetailOrderController.java | 14 ++++++++++--- .../service/impl/SaOrderServiceImpl.java | 2 +- 3 files changed, 23 insertions(+), 14 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 d8d1dbd5..27d0d54b 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 @@ -1525,16 +1525,17 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { boolean updateFlag = false; LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - if (null != saOrder.getPkGrade()) { - updateWrapper.set(CuMember::getPkSettleGrade, saOrder.getPkGrade()); - updateFlag = true; - - cuMember.setPkSettleGrade(saOrder.getPkGrade()); - } +// if (null != saOrder.getPkGrade()) { +// updateWrapper.set(CuMember::getPkSettleGrade, saOrder.getPkGrade()); +// updateFlag = true; +// +// cuMember.setPkSettleGrade(saOrder.getPkGrade()); +// } if (activateFlag) { updateWrapper.set(null != cuMember.getIsActivate(), CuMember::getIsActivate, cuMember.getIsActivate()); updateWrapper.set(null != cuMember.getPayStatus(), CuMember::getPayStatus, cuMember.getPayStatus()); updateWrapper.set(null != cuMember.getPayTime(), CuMember::getPayTime, cuMember.getPayTime()); + updateFlag = true; } if (updateFlag) { // 更新会员信息 @@ -1543,10 +1544,10 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { cuMemberService.update(updateWrapper); } - if (!cuMember.getPkSettleGrade().equals(saOrder.getPkGradeOld())) { - // 保存会员等级变动（如果旧等级和新等级相同，则不记录） - saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, saOrder.getPkGradeOld()); - } +// if (!cuMember.getPkSettleGrade().equals(saOrder.getPkGradeOld())) { +// // 保存会员等级变动（如果旧等级和新等级相同，则不记录） +// saveLevelUpgrade(cuMember, EUpgradeType.BUY_UPGRADE.getValue(), saOrder, saOrder.getPkGradeOld()); +// } this.handleRetailMemberAccount(saOrder, cuMemberAccountExt); } diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java index d67af901..54ea00d2 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/api/ApiRetailOrderController.java @@ -342,6 +342,10 @@ public class ApiRetailOrderController { if (null == updateGradeMember) { throw new ServiceException("升级编号不存在，请重试"); } + String otherCheckStr = this.otherOrderCheck(updateGradeMember, upgradeParam.getSpecialArea()); + if (null != otherCheckStr) { + return AjaxResult.error(otherCheckStr); + } upgradeParam.setUpgradeMember(updateGradeMember); // 购物车中获取商品信息 @@ -375,6 +379,10 @@ public class ApiRetailOrderController { if (null == updateGradeMember) { throw new ServiceException("升级编号不存在，请重试"); } + String otherCheckStr = this.otherOrderCheck(updateGradeMember, payParam.getSpecialArea()); + if (null != otherCheckStr) { + return AjaxResult.error(otherCheckStr); + } // 封装订单信息 SaOrderExt saOrderExt = iRetailOrderService.createSaOrder(upgradeParam, null, updateGradeMember); @@ -710,9 +718,9 @@ public class ApiRetailOrderController { if (null == buyMember) { return "购买会员编号不存在，请重试"; } - if (ESpecialArea.RETAIL_REPURCHASE.getValue() != specialArea) { - // 2025.02.24 新需求，升级专区取消，V0可以直接购买复购专区 - // 判断购买会员是否是V0，V0不允许下升级以外订单 + if (ESpecialArea.RETAIL_UPGRADE.getValue() != specialArea + && ESpecialArea.RETAIL_REPURCHASE.getValue() != specialArea) { + // 判断购买会员是否是V0，V0不允许下升级、复购以外订单 GradeDTO gradeDTO = iGradeServiceApi.getGrade(buyMember.getPkSettleGrade()).getData(); if (gradeDTO.getGradeValue() == EGrade.START_UP.getValue()) { return "当前购买会员编号不允许下单"; 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 acfff3a0..968b39b2 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 @@ -2673,7 +2673,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl BdGrade memberGrade = gradeList.stream().filter(tmpGrade -> tmpGrade.getPkId().equals(updateGradeMember.getPkSettleGrade())).findFirst().get(); if (memberGrade.getGradeValue().compareTo(EGrade.MAKER.getValue()) >= 0) { // 会员等级大于等于V3（卓越），不能通过升级进行购买了 - throw new ServiceException("当前已是最高等级"); + throw new ServiceException("当前已经是可以购买的最高等级"); } // 计算等级