Merge remote-tracking branch 'origin/feature/0721-tenant' into feature/0721-tenant

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PaymentDivMemberRecordServiceImpl.java

@@ -230,6 +230,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
 
         // 先计算分账金额，写入流水，最后执行分账，在写入分账数据
 
+
         // 分账
         Map<Long, BigDecimal> tenantdivMap = new HashMap<>();
         // 分润
@@ -250,7 +251,7 @@ public class PaymentDivMemberRecordServiceImpl extends ServiceImpl<PaymentDivMem
 
             BigDecimal tenantAmount = tenantAlbumContent.getSalePrice().subtract(tenantAlbumContent.getOriginalPrice());
 
-            tenantdivMap.merge(userPaymentOrder.getTenantId(), tenantAmount, BigDecimal::add);
+            tenantdivMap.merge(tenantAlbumContent.getTenantId(), tenantAmount, BigDecimal::add);
             tenantdivMap.merge(-1L, tenantAmount, BigDecimal::subtract);
 
         }