Просмотр исходного кода

chore: auto bump version and changelog [skip ci]

iwt 2 месяцев назад
Родитель
Сommit
3a5a29995b

+ 2 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/CommissionRecord.java

@@ -42,6 +42,8 @@ public class CommissionRecord implements Serializable {
     // 提现时间
     // 提现时间
     private Date withdrawnAt;
     private Date withdrawnAt;
 
 
+    private Long familyId;
+
     private String remark;
     private String remark;
 
 
     private Date createdAt;
     private Date createdAt;

+ 1 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/CommissionService.java

@@ -317,7 +317,7 @@ public class CommissionService {
                     if (l2Amount > 0) {
                     if (l2Amount > 0) {
                         createCommissionRecord(orderId, orderType, l2ReferrerId, buyerId,
                         createCommissionRecord(orderId, orderType, l2ReferrerId, buyerId,
                                 "member", orderAmount, 0, l2Amount,
                                 "member", orderAmount, 0, l2Amount,
-                                2, "settled", new Date());
+                                2, "settled", new Date(), l2Referrer.getFamilyId());
 
 
                         l2Referrer.setTotalCommissionEarned(
                         l2Referrer.setTotalCommissionEarned(
                                 (l2Referrer.getTotalCommissionEarned() != null ? l2Referrer.getTotalCommissionEarned() : 0L)
                                 (l2Referrer.getTotalCommissionEarned() != null ? l2Referrer.getTotalCommissionEarned() : 0L)

+ 1 - 1
cfc-web/.last_build_commit

@@ -1 +1 @@
-51be53955866649acf4e2b0df4aaea74a34687fe
+4be8484ee437c95c72fb6036651bc7de3cedc895