angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

## 升级订单处理等级返回调整；

This commit is contained in:
cabbage 2025-06-10 15:06:37 +08:00
parent 933056496c
commit 17106259ff
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bd-api/bd-api-sale/src/main/java/com/hzs/retail/sale/IRetailOrderServiceApi.java
View File

@ -3,11 +3,7 @@ package com.hzs.retail.sale;
import com.hzs.common.core.domain.R; import com.hzs.common.core.domain.R;
/** /**
* @Description: 新零售订单dubbo服务 * 新零售订单dubbo服务
* @Author: jiang chao
* @Time: 2024/12/30 16:25
* @Classname: IRetailOrderServiceApi
* @PackageName: com.hzs.retail.sale
*/ */
public interface IRetailOrderServiceApi { public interface IRetailOrderServiceApi {

6
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -214,9 +214,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
|| ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea()) { || ESpecialArea.RETAIL_UPGRADE.getValue() == orderParam.getSpecialArea()) {
// 注册、升级订单，计算会员等级 // 注册、升级订单，计算会员等级
BdGrade newGrade = iSaOrderService.calculateGrade(orderParam.getSpecialArea(), orderParam.getOrderItemsParams(), gradeList, cuMember, orderParam.getSystemType()); BdGrade newGrade = iSaOrderService.calculateGrade(orderParam.getSpecialArea(), orderParam.getOrderItemsParams(), gradeList, cuMember, orderParam.getSystemType());
// if (null == newGrade) { if (null == newGrade) {
// throw new ServiceException("会员不满足升级条件"); throw new ServiceException("会员不满足升级条件");
// } }
saOrderExt.setPkGrade(newGrade.getPkId()); saOrderExt.setPkGrade(newGrade.getPkId());
// 会员信息 // 会员信息
if (null != cuMember) { if (null != cuMember) {

6
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/service/impl/SaOrderServiceImpl.java
View File

@ -2550,7 +2550,7 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue()); saOrderExt.setUpdateFlag(EYesNo.YES.getIntValue());
} }
// TODO new 恢复升级专区，复购专区不需要处理等级问题 // TODO 恢复升级专区，复购专区不需要处理等级问题
// // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验 // // 如果复购订单后面还有升级订单，不需要处理等级问题； 复购订单后面没有升级订单，走新逻辑校验
// if (this.count(Wrappers.<SaOrder>lambdaQuery() // if (this.count(Wrappers.<SaOrder>lambdaQuery()
// .eq(SaOrder::getPkMember, saOrderExt.getPkMember()) // .eq(SaOrder::getPkMember, saOrderExt.getPkMember())
@ -2667,9 +2667,9 @@ public class SaOrderServiceImpl extends ServiceImpl<SaOrderMapper, SaOrder> impl
// 计算等级 // 计算等级
bdGrade = this.getGradeByBox(boxNum, gradeList, memberGrade, true); bdGrade = this.getGradeByBox(boxNum, gradeList, memberGrade, true);
// 会员等级比购买盒数的等级要高，则以会员当前等级为准 // 会员等级 大于等于 购买盒数等级，则不充足升级条件
if (memberGrade.getGradeValue().compareTo(bdGrade.getGradeValue()) >= 0) { if (memberGrade.getGradeValue().compareTo(bdGrade.getGradeValue()) >= 0) {
bdGrade = memberGrade; return null;
} }
} }
return bdGrade; return bdGrade;