From b0380366272dd9cd2bdc67257707eb7a89ee5f77 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 7 May 2025 11:51:07 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=B8=81=E7=B1=BB=E5=9E=8B=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/detail/provider/CuMemberServiceLogProvider.java | 2 +- .../com/hzs/sale/order/service/impl/SaOrderServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java index c6415e5f..eafa75b0 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/detail/provider/CuMemberServiceLogProvider.java @@ -42,7 +42,7 @@ public class CuMemberServiceLogProvider implements ICuMemberServiceLogServiceApi if (null == upPolicyCurrency) { // 血缘上政策币 - CuMemberServiceLog cuMemberServiceLog = iCuMemberServiceLogService.getBloodMemberServiceLog(pkMember, 1); + CuMemberServiceLog cuMemberServiceLog = iCuMemberServiceLogService.getBloodMemberServiceLog(pkMember, EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue()); if (null != cuMemberServiceLog) { try { upPolicyCurrency = JSONUtil.toBean(cuMemberServiceLog.getNewValue(), UpPolicyCurrency.class); 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 52994d54..8cfcf8af 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 @@ -343,7 +343,11 @@ public class SaOrderServiceImpl extends ServiceImpl impl } // 个人政策币配置，政策币个人配置优先特殊配置 - UpPolicyCurrency upPolicyCurrency = iCuMemberServiceLogServiceApi.queryMaxCuMemberServiceLog(cuMemberAccount.getPkMember(), Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue())).getData(); + UpPolicyCurrency upPolicyCurrency = null; + if (EOrderType.REGISTER_ORDER.getValue() == saOrder.getOrderType() + || EOrderType.UPGRADE_ORDER.getValue() == saOrder.getOrderType()) { + upPolicyCurrency = iCuMemberServiceLogServiceApi.queryMaxCuMemberServiceLog(cuMemberAccount.getPkMember(), Collections.singletonList(EApprovalBusiness.POLICY_CURRENCY_YES_NO.getValue())).getData(); + } // 验证商品是否存在特殊消费配置 if (CollectionUtil.isNotEmpty(orderItemList)) {