|
|
@@ -409,6 +409,13 @@ public class MembershipService implements MembershipServiceInterface {
|
|
|
upgradeRecord.setCreatedAt(new Date());
|
|
|
memberUpgradeRecordMapper.insert(upgradeRecord);
|
|
|
|
|
|
+ // 发放JOIN会员券(按等级匹配grantType=JOIN的券模板)
|
|
|
+ try {
|
|
|
+ couponService.grantJoinCoupons(adminUserId, order.getLevelCode(), order.getOrderNo());
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("发放JOIN会员券异常: userId={}, levelCode={}", adminUserId, order.getLevelCode(), e);
|
|
|
+ }
|
|
|
+
|
|
|
// 结算佣金(L1+L2)
|
|
|
commissionService.settleTwoLevel(
|
|
|
order.getId(),
|
|
|
@@ -644,6 +651,12 @@ public class MembershipService implements MembershipServiceInterface {
|
|
|
record.setExpireTime(expireTime);
|
|
|
record.setCreatedAt(new Date());
|
|
|
memberUpgradeRecordMapper.insert(record);
|
|
|
+ // 发放JOIN会员券(赠送会员同样享有加入赠券)
|
|
|
+ try {
|
|
|
+ couponService.grantJoinCoupons(adminUserId, levelCode, sourceOrderNo);
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("发放JOIN会员券异常(赠送): userId={}, levelCode={}", adminUserId, levelCode, e);
|
|
|
+ }
|
|
|
return true;
|
|
|
}
|
|
|
|