diff --git a/bd-api/bd-api-sale/src/main/java/com/hzs/retail/sale/IRetailOrderServiceApi.java b/bd-api/bd-api-sale/src/main/java/com/hzs/retail/sale/IRetailOrderServiceApi.java index 6168971a..189d5e3b 100644 --- a/bd-api/bd-api-sale/src/main/java/com/hzs/retail/sale/IRetailOrderServiceApi.java +++ b/bd-api/bd-api-sale/src/main/java/com/hzs/retail/sale/IRetailOrderServiceApi.java @@ -3,11 +3,7 @@ package com.hzs.retail.sale; import com.hzs.common.core.domain.R; /** - * @Description: 新零售订单dubbo服务 - * @Author: jiang chao - * @Time: 2024/12/30 16:25 - * @Classname: IRetailOrderServiceApi - * @PackageName: com.hzs.retail.sale + * 新零售订单dubbo服务 */ public interface IRetailOrderServiceApi { diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java index 7ac2a093..1d6f993d 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java @@ -214,9 +214,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService { || ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea()) { // 注册、升级订单,计算会员等级 BdGrade newGrade = iSaOrderService.calculateGrade(orderParam.getSpecialArea(), orderParam.getOrderItemsParams(), gradeList, cuMember, orderParam.getSystemType()); -// if (null == newGrade) { -// throw new ServiceException("会员不满足升级条件"); -// } + if (null == newGrade) { + throw new ServiceException("会员不满足升级条件"); + } saOrderExt.setPkGrade(newGrade.getPkId()); // 会员信息 if (null != cuMember) { 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 2242e9dc..a65c2fd8 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 @@ -2550,7 +2550,7 @@ public class SaOrderServiceImpl extends ServiceImpl impl saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); } - // TODO new 恢复升级专区,复购专区不需要处理等级问题 + // TODO 恢复升级专区,复购专区不需要处理等级问题 // // 如果复购订单后面还有升级订单,不需要处理等级问题; 复购订单后面没有升级订单,走新逻辑校验 // if (this.count(Wrappers.lambdaQuery() // .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) @@ -2667,9 +2667,9 @@ public class SaOrderServiceImpl extends ServiceImpl impl // 计算等级 bdGrade = this.getGradeByBox(boxNum, gradeList, memberGrade, true); - // 会员等级比购买盒数的等级要高,则以会员当前等级为准 + // 会员等级 大于等于 购买盒数等级,则不充足升级条件 if (memberGrade.getGradeValue().compareTo(bdGrade.getGradeValue()) >= 0) { - bdGrade = memberGrade; + return null; } } return bdGrade;