angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 报单赠送判断权限修改

This commit is contained in:
zhangheng 2025-10-20 14:58:22 +08:00
parent adc47d80a7
commit a2e51b9c9f
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bd-business/bd-business-sale/src/main/java/com/hzs/activity/tourism/provider/AcTourismServiceProvider.java
View File

@ -149,22 +149,24 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi {
log.warn("当前订单已同步至报单明细{}", order.getOrderCode()); log.warn("当前订单已同步至报单明细{}", order.getOrderCode());
return; return;
} }
// 查询会员信息 // 查询新会员信息
R<CuMember> memberResult = iMemberServiceApi.getMember(order.getPkMember()); R<CuMember> newMemberResult = iMemberServiceApi.getMember(order.getPkMember());
CuMember member = memberResult.getData(); CuMember newMember = newMemberResult.getData();
// 查询老会员信息
if (member == null) { R<CuMember> oldMemberResult = iMemberServiceApi.getMember(order.getPkCreator());
log.warn("会员信息不存在, orderId={}", order.getPkId()); CuMember oldMember = oldMemberResult.getData();
if (oldMember == null || newMember == null) {
log.warn("会员信息不存在, 新会员id={},老会员id={}", order.getPkMember(), order.getPkCreator());
return; return;
} }
// 组合 key 匹配活动配置 // 组合 key 匹配活动配置
String key = member.getRegisterAuthority() + "_" + member.getPkSettleGrade(); String key = oldMember.getRegisterAuthority() + "_" + newMember.getPkSettleGrade();
AcDeclarationGiftConfig matchedConfig = configMap.get(key); AcDeclarationGiftConfig matchedConfig = configMap.get(key);
if (matchedConfig == null) { if (matchedConfig == null) {
log.info("未找到匹配的报单赠送配置, 会员id={}, 注册权限={}, 结算等级={}", log.info("未找到匹配的报单赠送配置, 会员id={}, 老会员注册权限={}, 新会员结算等级={}",
member.getPkId(), member.getRegisterAuthority(), member.getPkSettleGrade()); oldMember.getPkId(), oldMember.getRegisterAuthority(), newMember.getPkSettleGrade());
return; return;
} }
@ -176,13 +178,13 @@ public class AcTourismServiceProvider implements IAcTourismServiceApi {
.build(); .build();
record.setCreationTime(new Date()); record.setCreationTime(new Date());
record.setDelFlag(0); record.setDelFlag(0);
record.setPkCreator(member.getPkId()); record.setPkCreator(oldMember.getPkId());
record.setPkCountry(pkCountry); record.setPkCountry(pkCountry);
// 插入数据库 // 插入数据库
iAcDeclarationGiftRecordService.save(record); iAcDeclarationGiftRecordService.save(record);
log.info("成功插入报单赠送记录 -> memberId={}, ruleId={}", log.info("成功插入报单赠送记录 -> memberId={}, ruleId={}",
member.getPkId(), matchedConfig.getPkId()); oldMember.getPkId(), matchedConfig.getPkId());
}); });
return R.ok(); return R.ok();
} }