应付明细13

yd-csf-feign/src/main/java/com/yd/csf/feign/response/expectedfortune/ApiExpectedFortunePageResponse.java

@@ -50,6 +50,9 @@ public class ApiExpectedFortunePageResponse {
     @Schema(description = "职级")
     @Schema(description = "职级")
     private String brokerGradeName;
     private String brokerGradeName;
 
 
+    @Schema(description = "关联人员")
+    private String associatedPerson;
+
     @Schema(description = "团队名称")
     @Schema(description = "团队名称")
     private String team;
     private String team;
 
 

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java

@@ -785,6 +785,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 BigDecimal hkdAmount = fortune.getRuleAmount().multiply(exchangeRate);
                 BigDecimal hkdAmount = fortune.getRuleAmount().multiply(exchangeRate);
 
 
                 fortune.setHkdAmount(hkdAmount);
                 fortune.setHkdAmount(hkdAmount);
+                fortune.setCurrentPaymentAmount(fortune.getRuleAmount());
                 fortune.setCurrentPaymentHkdAmount(hkdAmount);
                 fortune.setCurrentPaymentHkdAmount(hkdAmount);
                 // 重新计算发放币种金额
                 // 重新计算发放币种金额
                 BigDecimal payoutAmount = hkdAmount.multiply(expectedFortune.getHkdToPayoutRate());
                 BigDecimal payoutAmount = hkdAmount.multiply(expectedFortune.getHkdToPayoutRate());

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/ExpectedFortuneServiceImpl.java

@@ -365,6 +365,8 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
         Set<String> policyNoList = records.stream().map(ApiExpectedFortunePageResponse::getPolicyNo).collect(Collectors.toSet());
         Set<String> policyNoList = records.stream().map(ApiExpectedFortunePageResponse::getPolicyNo).collect(Collectors.toSet());
         Map<String, PolicyFollow> policyFollowMap = policyFollowService.queryPolicyFollowMap(policyNoList);
         Map<String, PolicyFollow> policyFollowMap = policyFollowService.queryPolicyFollowMap(policyNoList);
 
 
+        // 5. 补充关联人员信息
+
         for (ApiExpectedFortunePageResponse vo : records) {
         for (ApiExpectedFortunePageResponse vo : records) {
             UserGradeDto userGradeDto = userGradeMap.get(vo.getBrokerBizId());
             UserGradeDto userGradeDto = userGradeMap.get(vo.getBrokerBizId());
             if (userGradeDto != null) {
             if (userGradeDto != null) {

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java

@@ -183,6 +183,8 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
                 for (Fortune item : fortuneList) {
                 for (Fortune item : fortuneList) {
                     Fortune updateFortune = new Fortune();
                     Fortune updateFortune = new Fortune();
                     updateFortune.setId(item.getId());
                     updateFortune.setId(item.getId());
+                    updateFortune.setExpectedFortuneBizId(item.getExpectedFortuneBizId());
+                    updateFortune.setRuleAmount(item.getRuleAmount());
                     updateFortune.setFortuneAccountBizId(fortuneAccountBizId);
                     updateFortune.setFortuneAccountBizId(fortuneAccountBizId);
                     updateFortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
                     updateFortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
                     updateFortune.setReconciliationOperator(currentLoginUser.getRealName());
                     updateFortune.setReconciliationOperator(currentLoginUser.getRealName());
@@ -227,7 +229,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
             if (ef != null) {
             if (ef != null) {
                 BigDecimal currentPaymentRatio = BigDecimal.ZERO;
                 BigDecimal currentPaymentRatio = BigDecimal.ZERO;
                 if (BigDecimal.ZERO.compareTo(ef.getRuleAmount()) != 0) {
                 if (BigDecimal.ZERO.compareTo(ef.getRuleAmount()) != 0) {
-                    currentPaymentRatio = f.getCurrentPaymentAmount()
+                    currentPaymentRatio = f.getRuleAmount()
                             .divide(ef.getRuleAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
                             .divide(ef.getRuleAmount(), 4, RoundingMode.HALF_UP).multiply(BigDecimal.valueOf(100));
                 }
                 }
                 f.setCurrentPaymentRatio(currentPaymentRatio);
                 f.setCurrentPaymentRatio(currentPaymentRatio);

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -68,7 +68,7 @@
             MAX(ef.fortune_total_period) as fortuneTotalPeriod,
             MAX(ef.fortune_total_period) as fortuneTotalPeriod,
             ifnull(sum(ef.original_amount), 0) as amount,
             ifnull(sum(ef.original_amount), 0) as amount,
             ifnull(sum(ef.hkd_amount), 0) as hkdAmount,
             ifnull(sum(ef.hkd_amount), 0) as hkdAmount,
-            MAX(ef.original_currency) as currency,
+            MAX(ef.payout_currency) as currency,
             ifnull(sum(ef.paid_amount), 0) as paidAmount,
             ifnull(sum(ef.paid_amount), 0) as paidAmount,
             ifnull(sum(ef.unpaid_amount), 0) as unpaidAmount,
             ifnull(sum(ef.unpaid_amount), 0) as unpaidAmount,
             case when ifnull(sum(ef.hkd_amount), 0) > 0
             case when ifnull(sum(ef.hkd_amount), 0) > 0
@@ -81,7 +81,7 @@
             end as unpaidRatio,
             end as unpaidRatio,
             MAX(pf.first_broker) as broker,
             MAX(pf.first_broker) as broker,
             MAX(pf.first_broker_biz_id) as brokerBizId,
             MAX(pf.first_broker_biz_id) as brokerBizId,
-            DATE_ADD(DATE_ADD(MAX(p.effective_date), INTERVAL 2 MONTH), INTERVAL (ef.fortune_period - 1) YEAR) as payoutDate
+            MAX(ef.payout_date) as payoutDate
         from expected_fortune ef
         from expected_fortune ef
         left join policy p on ef.policy_no = p.policy_no
         left join policy p on ef.policy_no = p.policy_no
         left join policy_follow pf on ef.policy_no = pf.policy_no
         left join policy_follow pf on ef.policy_no = pf.policy_no
@@ -113,7 +113,7 @@
             ef.fortune_total_period as fortuneTotalPeriod,
             ef.fortune_total_period as fortuneTotalPeriod,
             ifnull(ef.original_amount, 0) as amount,
             ifnull(ef.original_amount, 0) as amount,
             ifnull(ef.hkd_amount, 0) as hkdAmount,
             ifnull(ef.hkd_amount, 0) as hkdAmount,
-            ef.original_currency as currency,
+            ef.payout_currency as currency,
             ifnull(ef.paid_amount, 0) as paidAmount,
             ifnull(ef.paid_amount, 0) as paidAmount,
             ifnull(ef.unpaid_amount, 0) as unpaidAmount,
             ifnull(ef.unpaid_amount, 0) as unpaidAmount,
             case when ifnull(ef.hkd_amount, 0) > 0
             case when ifnull(ef.hkd_amount, 0) > 0