From fe34a1bf25d6f9426b50067a7ba86e1d64c3a8b3 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Tue, 28 Oct 2025 09:33:32 +0800 Subject: [PATCH] ## Fix - bugID=(448, 449) --- .../controller/service/impl/RetailOrderServiceImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 f32f0c01..7e8eb657 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 @@ -39,6 +39,7 @@ import com.hzs.sale.order.param.OrderItemsParam; import com.hzs.sale.order.param.WaresNumberParam; import com.hzs.sale.order.service.*; import com.hzs.sale.order.service.impl.SaOrderHandle; +import com.hzs.sale.order.service.impl.SaOrderServiceImpl; import com.hzs.sale.product.service.IBdProductService; import com.hzs.sale.wares.service.IBdWaresDetailService; import com.hzs.sale.wares.service.IBdWaresExtendService; @@ -108,7 +109,6 @@ public class RetailOrderServiceImpl implements IRetailOrderService { @DubboReference ISmsServiceApi iSmsServiceApi; - @Override public String confirmRegOrder(RetailOrderRegisterParam registerParam, List gradeList) { // 新会员 @@ -301,6 +301,9 @@ public class RetailOrderServiceImpl implements IRetailOrderService { if (CollectionUtil.isEmpty(gradeList)) { gradeList = iGradeServiceApi.getRetailGradeList().getData(); } + if(ObjectUtil.isEmpty(updateGradeMember.getPkSettleGrade())){ + updateGradeMember.setPkSettleGrade(iSaOrderService.calculateGrade().getPkId()); + } BdGrade bdGrade = gradeList.stream().filter(tmpGrade -> updateGradeMember.getPkSettleGrade().equals(tmpGrade.getPkId())).findFirst().get(); if (bdGrade.getGradeValue() == EGrade.YOU_KE.getValue()) { @@ -715,7 +718,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService { || EOrderType.RETAIL_UPGRADE.getValue() == saOrderExt.getOrderType()) { // 处理等级 CuMember sourceMember = iMemberServiceApi.getMember(gradeMember.getPkId()).getData(); - GradeDTO bdGrade = iGradeServiceApi.getGrade(sourceMember.getPkSettleGrade()).getData(); + Integer pkSettleGrade = ObjectUtil.isNotEmpty(sourceMember) ? sourceMember.getPkSettleGrade() : gradeMember.getPkSettleGrade(); + GradeDTO bdGrade = iGradeServiceApi.getGrade(pkSettleGrade).getData(); if (bdGrade.getGradeValue() < EGrade.YOU_KE.getValue()) { List tmpGradeList = iGradeServiceApi.getRetailGradeList().getData(); // 等级值倒序