From d17986e1556d94d700d7d32732daaeb6337c43ba Mon Sep 17 00:00:00 2001 From: zhangheng Date: Mon, 20 Oct 2025 14:58:22 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E6=8A=A5=E5=8D=95=E8=B5=A0=E9=80=81?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=83=E9=99=90=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/AcTourismServiceProvider.java | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java index 26a3cd6e..1c570859 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java @@ -149,22 +149,24 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi { log.warn("当前订单已同步至报单明细{}", order.getOrderCode()); return; } - // 查询会员信息 - R memberResult = iMemberServiceApi.getMember(order.getPkMember()); - CuMember member = memberResult.getData(); - - if (member == null) { - log.warn("会员信息不存在, orderId={}", order.getPkId()); + // 查询新会员信息 + R newMemberResult = iMemberServiceApi.getMember(order.getPkMember()); + CuMember newMember = newMemberResult.getData(); + // 查询老会员信息 + R oldMemberResult = iMemberServiceApi.getMember(order.getPkCreator()); + CuMember oldMember = oldMemberResult.getData(); + if (oldMember == null || newMember == null) { + log.warn("会员信息不存在, 新会员id={},老会员id={}", order.getPkMember(), order.getPkCreator()); return; } // 组合 key 匹配活动配置 - String key = member.getRegisterAuthority() + "_" + member.getPkSettleGrade(); + String key = oldMember.getRegisterAuthority() + "_" + newMember.getPkSettleGrade(); AcDeclarationGiftConfig matchedConfig = configMap.get(key); if (matchedConfig == null) { - log.info("未找到匹配的报单赠送配置, 会员id={}, 注册权限={}, 结算等级={}", - member.getPkId(), member.getRegisterAuthority(), member.getPkSettleGrade()); + log.info("未找到匹配的报单赠送配置, 会员id={}, 老会员注册权限={}, 新会员结算等级={}", + oldMember.getPkId(), oldMember.getRegisterAuthority(), newMember.getPkSettleGrade()); return; } @@ -176,13 +178,13 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi { .build(); record.setCreationTime(new Date()); record.setDelFlag(0); - record.setPkCreator(member.getPkId()); + record.setPkCreator(oldMember.getPkId()); record.setPkCountry(pkCountry); // 插入数据库 iAcDeclarationGiftRecordService.save(record); log.info("成功插入报单赠送记录 -> memberId={}, ruleId={}", - member.getPkId(), matchedConfig.getPkId()); + oldMember.getPkId(), matchedConfig.getPkId()); }); return R.ok(); }