出账检核-入账金额

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

@@ -641,7 +641,7 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         if (fortuneStatistics.getAvailableOutAmount() == null) {
         if (fortuneStatistics.getAvailableOutAmount() == null) {
             fortuneStatistics.setAvailableOutAmount(BigDecimal.ZERO);
             fortuneStatistics.setAvailableOutAmount(BigDecimal.ZERO);
         }
         }
-        // 计算总保费
+        // 计算总保费、入账金额
         if (CollectionUtils.isNotEmpty(fortuneIdList)) {
         if (CollectionUtils.isNotEmpty(fortuneIdList)) {
             List<Fortune> fortuneList = this.listByIds(fortuneIdList);
             List<Fortune> fortuneList = this.listByIds(fortuneIdList);
 
 
@@ -661,6 +661,18 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
                 }
                 }
                 fortuneStatistics.setTotalPremium(totalPremium);
                 fortuneStatistics.setTotalPremium(totalPremium);
             }
             }
+            // 查询总入账金额
+            List<Commission> commissions = commissionService.lambdaQuery()
+                    .in(Commission::getPolicyNo, policyNoSet)
+                    .select(Commission::getHkdAmount)
+                    .list();
+            BigDecimal totalInAmount = BigDecimal.ZERO;
+            if (CollectionUtils.isNotEmpty(commissions)) {
+                for (Commission commission : commissions) {
+                    totalInAmount = totalInAmount.add(commission.getHkdAmount());
+                }
+                fortuneStatistics.setTotalInAmount(totalInAmount);
+            }
         }
         }
 
 
         return fortuneStatistics;
         return fortuneStatistics;

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

@@ -70,8 +70,7 @@
                 from expected_fortune where status = '0' and policy_no = f.policy_no
                 from expected_fortune where status = '0' and policy_no = f.policy_no
                 ),0) AS pendingOutAmount,
                 ),0) AS pendingOutAmount,
             SUM(CASE WHEN f.status in ('6','1') THEN f.current_payment_hkd_amount ELSE 0 END) AS availableOutAmount,
             SUM(CASE WHEN f.status in ('6','1') THEN f.current_payment_hkd_amount ELSE 0 END) AS availableOutAmount,
-            COUNT(DISTINCT f.policy_no) AS totalPolicyCount,
-            MAX(ce.expected_amount) AS totalInAmount
+            COUNT(DISTINCT f.policy_no) AS totalPolicyCount
         FROM fortune f
         FROM fortune f
         LEFT JOIN commission_expected ce ON f.commission_expected_biz_id = ce.commission_expected_biz_id
         LEFT JOIN commission_expected ce ON f.commission_expected_biz_id = ce.commission_expected_biz_id
         WHERE 1 = 1
         WHERE 1 = 1