diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java index 6debd753..86295d1d 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/base/IMemberServiceApi.java @@ -296,9 +296,9 @@ public interface IMemberServiceApi { * 用户降级 -- 来源于活动 * * @param cuMember 用户信息 - * @param saOrder 订单信息 + * @param pkOrder 订单ID */ - R reduceMemberLevel(CuMember cuMember, SaOrder saOrder); + R reduceMemberLevel(CuMember cuMember, Long pkOrder); /** * 更新升级记录 -- 来源于活动 diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java index 2655e529..4415b48c 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/provider/MemberServiceProvider.java @@ -352,9 +352,9 @@ public class MemberServiceProvider implements IMemberServiceApi { } @Override - public R reduceMemberLevel(CuMember cuMember, SaOrder saOrder) { + public R reduceMemberLevel(CuMember cuMember, Long pkOrder) { try { - iCuMemberBusinessService.reduceMemberLevel(cuMember, saOrder); + iCuMemberBusinessService.reduceMemberLevel(cuMember, pkOrder); return R.ok(); } catch (Exception e) { return R.fail(e.getMessage()); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java index bb9504cc..4988cb15 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberBusinessService.java @@ -180,9 +180,9 @@ public interface ICuMemberBusinessService { * 用户降级 -- 来源于活动 * * @param cuMember 用户信息 - * @param saOrder 订单信息 + * @param pkOrder 订单ID */ - void reduceMemberLevel(CuMember cuMember, SaOrder saOrder); + void reduceMemberLevel(CuMember cuMember, Long pkOrder); /** * 更新升级记录 -- 来源于活动 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 a92dc78e..bfa2fd17 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 @@ -1207,12 +1207,12 @@ public class CuMemberBusinessServiceImpl implements ICuMemberBusinessService { @Transactional(rollbackFor = Exception.class) @Override - public void reduceMemberLevel(CuMember cuMember, SaOrder saOrder) { + public void reduceMemberLevel(CuMember cuMember, Long pkOrder) { updateCuMember(cuMember); iCuMemberLevelService.update(Wrappers.lambdaUpdate() .eq(CuMemberLevel::getPkMember, cuMember.getPkId()) .eq(CuMemberLevel::getUpType, EUpgradeType.ACTIVITY_UPGRADE.getValue()) - .eq(CuMemberLevel::getPkOrder, saOrder.getPkId()) + .eq(CuMemberLevel::getPkOrder, pkOrder) .set(CuMemberLevel::getDelFlag, EDelFlag.DELETE.getValue()) .set(CuMemberLevel::getUpgradeTime, new Date()) ); diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java index 6a94b9db..0f216ef3 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/recommend/service/impl/AcRepurCouponsRuleConfigServiceImpl.java @@ -707,10 +707,12 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl upgradeRecordList = iAcRecomUpgradeRecordService.list(Wrappers.lambdaQuery() .eq(AcRecomUpgradeRecord::getPkMember, pkMember) - .eq(AcRecomUpgradeRecord::getPkOrderId, pkOrderId) + .eq(AcRecomUpgradeRecord::getUpgradeTime, upgradeTime) .orderByDesc(AcRecomUpgradeRecord::getUpgradeTime) ); if (CollectionUtil.isNotEmpty(upgradeRecordList)) { @@ -732,10 +734,10 @@ public class AcRepurCouponsRuleConfigServiceImpl extends ServiceImpl