新单跟进81

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

@@ -16,7 +16,9 @@ import com.yd.common.exception.BusinessException;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.service.dto.*;
 import com.yd.csf.service.enums.FortuneStatusEnum;
+import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.Fortune;
+import com.yd.csf.service.service.CommissionService;
 import com.yd.csf.service.service.FortuneAccountService;
 import com.yd.csf.service.service.FortuneService;
 import com.yd.csf.service.dao.FortuneMapper;
@@ -49,6 +51,9 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
     @Resource
     private FortuneAccountService fortuneAccountService;
 
+    @Resource
+    private CommissionService commissionService;
+
     @Override
     public Wrapper<Fortune> getQueryWrapper(FortuneQueryRequest fortuneQueryRequest) {
         QueryWrapper<Fortune> queryWrapper = new QueryWrapper<>();
@@ -72,11 +77,14 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
             return fortuneVOPage;
         }
 
-        List<FortuneVO> fortuneVOList = fortuneList.stream().map(fortune -> {
-            FortuneVO fortuneVO = new FortuneVO();
-            BeanUtils.copyProperties(fortune, fortuneVO);
-            return fortuneVO;
-        }).collect(Collectors.toList());
+        List<FortuneVO> fortuneVOList = fortuneList.stream().map(FortuneVO::objToVo).collect(Collectors.toList());
+        // 关联查询已来佣金额
+        List<Commission> commissionList = commissionService.list(new QueryWrapper<Commission>().in("commission_biz_id", fortuneList.stream().map(Fortune::getCommissionBizId).collect(Collectors.toList())));
+        Map<String, BigDecimal> commissionAmountMap = commissionList.stream().collect(Collectors.toMap(Commission::getCommissionBizId, Commission::getAmount));
+        fortuneVOList.forEach(fortuneVO -> {
+            String commissionBizId = fortuneVO.getCommissionBizId();
+            fortuneVO.setCommissionAmount(commissionAmountMap.getOrDefault(commissionBizId, BigDecimal.ZERO));
+        });
 
         fortuneVOPage.setRecords(fortuneVOList);
         return fortuneVOPage;

yd-csf-service/src/main/java/com/yd/csf/service/vo/FortuneVO.java

@@ -33,6 +33,18 @@ public class FortuneVO implements Serializable {
     private String policyNo;
 
     /**
+     * 来佣业务id
+     */
+    @Schema(description = "来佣业务id")
+    private String commissionBizId;
+
+    /**
+     * 本次已来佣金额
+     */
+    @Schema(description = "本次已来佣金额")
+    private Object commissionAmount;
+
+    /**
      * 发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)
      */
     @Schema(description = "发佣期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年)")