Pārlūkot izejas kodu

chore: auto bump version and changelog [skip ci]

iwt 1 nedēļu atpakaļ
vecāks
revīzija
75f9cd4c30

+ 2 - 15
cfc-backend/src/main/java/com/etotem/cfc/service/MembershipService.java

@@ -1241,21 +1241,8 @@ public class MembershipService implements MembershipServiceInterface {
         membership.setTransactionId(transactionId);
         membership.setAmount(0);
         membershipMapper.insert(membership);
-        // 升级用户
-        String fromLevel = adminUser.getMemberLevel() != null ? adminUser.getMemberLevel() : "FREE";
-        adminUser.setMemberLevel(levelCode);
-        adminUser.setMemberExpireTime(expireTime);
-        adminUser.setUpdatedAt(new Date());
-        userMapper.updateById(adminUser);
-        // 升级记录(upgradeType='gift')
-        MemberUpgradeRecord record = new MemberUpgradeRecord();
-        record.setUserId(adminUserId);
-        record.setFromLevel(fromLevel);
-        record.setToLevel(levelCode);
-        record.setUpgradeType("gift");
-        record.setExpireTime(expireTime);
-        record.setCreatedAt(new Date());
-        memberUpgradeRecordMapper.insert(record);
+        // 方案B:赠送会员也全家同步
+        syncMembershipToFamilyMembers(familyId, levelCode, expireTime, "gift", null);
         // 发放JOIN会员券(赠送会员同样享有加入赠券)
         try {
             couponService.grantFamilyJoinCoupons(familyId, levelCode, sourceOrderNo);

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-6c087d00cad8eff91949596ea747c36feb204cfb
+0fcb97be80acc7ebe2b85a9f6551f2e1aead8da7