业务员累计收入计算不对的问题

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserAccountServiceImpl.java

@@ -168,27 +168,29 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         param.setUserId(sysUserJzgInfo.getUserId());
         List<InsFeeOrders> insFeeOrdersList = quoteClient.getInsFeeOrderByUserId(param);
         BigDecimal premium = BigDecimal.ZERO;
-        BigDecimal orderAmount = BigDecimal.ZERO;
-        for (InsFeeOrders insFeeOrders : insFeeOrdersList) {
-            premium = premium.add(insFeeOrders.getTotalPremium());
-            orderAmount = orderAmount.add(insFeeOrders.getTotalReceivablePremium());
-        }
+//        BigDecimal orderAmount = BigDecimal.ZERO;
+//        for (InsFeeOrders insFeeOrders : insFeeOrdersList) {
+//            premium = premium.add(insFeeOrders.getTotalPremium());
+//            orderAmount = orderAmount.add(insFeeOrders.getTotalReceivablePremium());
+//        }
         InsFeeOrdersParam distributionParam = new InsFeeOrdersParam();
         distributionParam.setDistributorId(sysUserJzgInfo.getId());
-        List<InsFeeOrders> distribuitonList = quoteClient.getInsFeeOrdersList(distributionParam);
-        BigDecimal distributionPremium = BigDecimal.ZERO;
-        for (InsFeeOrders insFeeOrders : distribuitonList) {
-            if (sysUserJzgInfo.getId().equals(insFeeOrders.getFirstDistributorId())) {
-                distributionPremium = distributionPremium.add(insFeeOrders.getFirstDistributionFee() != null ? insFeeOrders.getFirstDistributionFee() : BigDecimal.ZERO);
-            }
-            if (sysUserJzgInfo.getId().equals(insFeeOrders.getSecondDistributorId())) {
-                distributionPremium = distributionPremium.add(insFeeOrders.getSecondDistributionFee() != null ? insFeeOrders.getSecondDistributionFee() : BigDecimal.ZERO);
-            }
-            if (sysUserJzgInfo.getId().equals(insFeeOrders.getThirdDistributorId())) {
-                distributionPremium = distributionPremium.add(insFeeOrders.getThirdDistributionFee() != null ? insFeeOrders.getThirdDistributionFee() : BigDecimal.ZERO);
-            }
-        }
-        sysUserWalletVo.setTotalIncome(orderAmount.add(distributionPremium));
+//        List<InsFeeOrders> distribuitonList = quoteClient.getInsFeeOrdersList(distributionParam);
+//        BigDecimal distributionPremium = BigDecimal.ZERO;
+//        for (InsFeeOrders insFeeOrders : distribuitonList) {
+//            if (sysUserJzgInfo.getId().equals(insFeeOrders.getFirstDistributorId())) {
+//                distributionPremium = distributionPremium.add(insFeeOrders.getFirstDistributionFee() != null ? insFeeOrders.getFirstDistributionFee() : BigDecimal.ZERO);
+//            }
+//            if (sysUserJzgInfo.getId().equals(insFeeOrders.getSecondDistributorId())) {
+//                distributionPremium = distributionPremium.add(insFeeOrders.getSecondDistributionFee() != null ? insFeeOrders.getSecondDistributionFee() : BigDecimal.ZERO);
+//            }
+//            if (sysUserJzgInfo.getId().equals(insFeeOrders.getThirdDistributorId())) {
+//                distributionPremium = distributionPremium.add(insFeeOrders.getThirdDistributionFee() != null ? insFeeOrders.getThirdDistributionFee() : BigDecimal.ZERO);
+//            }
+//        }
+        // modify by lipf 2026年7月20日09:36:06 调整业务员累计收入的计算逻辑。直接从sys_user_account 表中获取
+        sysUserWalletVo.setTotalIncome(sysUserAccount.getSumAmount());
+        //sysUserWalletVo.setTotalIncome(orderAmount.add(distributionPremium));
         sysUserWalletVo.setSignPremium(premium);
         sysUserWalletVo.setOrderCount(String.valueOf(insFeeOrdersList.size()));
         List<SysUserJzgInfo> sysUserJzgInfoList = sysUserJzgInfoService.list(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getReferrerId, sysUserJzgInfo.getId()));