应付款管理-查看明细-出账记录

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiExpectedFortuneServiceImpl.java

@@ -28,6 +28,7 @@ import com.yd.csf.feign.response.expectedfortune.ApiGenerateExpectedFortuneRespo
 import com.yd.csf.service.dto.CommissionRuleBindingDto;
 import com.yd.csf.service.dto.CommissionRuleBindingDto;
 import com.yd.csf.service.dto.QueryPolicyAndBrokerDto;
 import com.yd.csf.service.dto.QueryPolicyAndBrokerDto;
 import com.yd.csf.service.dto.QueryPolicyBrokerDto;
 import com.yd.csf.service.dto.QueryPolicyBrokerDto;
+import com.yd.csf.service.enums.CurrencyEnum;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.enums.FortuneStatusEnum;
 import com.yd.csf.service.helper.FeignResultHelper;
 import com.yd.csf.service.helper.FeignResultHelper;
 import com.yd.csf.service.model.*;
 import com.yd.csf.service.model.*;
@@ -1020,8 +1021,10 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
             List<PayableReportVO> voList = payableReportPage.getRecords().stream().map(vo -> {
             List<PayableReportVO> voList = payableReportPage.getRecords().stream().map(vo -> {
                 Policy policy = policyMap.get(vo.getPolicyNo());
                 Policy policy = policyMap.get(vo.getPolicyNo());
                 PolicyFollow policyFollow= policyFollowMap.get(vo.getPolicyNo());
                 PolicyFollow policyFollow= policyFollowMap.get(vo.getPolicyNo());
+
+                vo.setCurrency(CurrencyEnum.toLabel(vo.getCurrency()));
                 if (policy != null) {
                 if (policy != null) {
-                    vo.setPolicyCurrency(policy.getCurrency());
+                    vo.setPolicyCurrency(CurrencyEnum.toLabel(policy.getCurrency()));
                 }
                 }
                 if (policyFollow != null) {
                 if (policyFollow != null) {
                     vo.setProductName(policyFollow.getProductName());
                     vo.setProductName(policyFollow.getProductName());

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yd.csf.feign.request.expectedfortune.ApiExpectedFortunePageRequest;
 import com.yd.csf.feign.request.expectedfortune.ApiExpectedFortunePageRequest;
 import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
 import com.yd.csf.feign.response.expectedfortune.ApiExpectedFortunePageResponse;
+import com.yd.csf.service.enums.CurrencyEnum;
 import com.yd.csf.service.model.ExpectedFortune;
 import com.yd.csf.service.model.ExpectedFortune;
 import com.yd.csf.service.dao.ExpectedFortuneMapper;
 import com.yd.csf.service.dao.ExpectedFortuneMapper;
 import com.yd.csf.service.model.Policy;
 import com.yd.csf.service.model.Policy;
@@ -133,6 +134,8 @@ public class ExpectedFortuneServiceImpl extends ServiceImpl<ExpectedFortuneMappe
             ApiExpectedFortunePageResponse vo = new ApiExpectedFortunePageResponse();
             ApiExpectedFortunePageResponse vo = new ApiExpectedFortunePageResponse();
             BeanUtils.copyProperties(ef, vo);
             BeanUtils.copyProperties(ef, vo);
 
 
+            vo.setCurrency(CurrencyEnum.toLabel(ef.getCurrency()));
+
             String ratio = finalBrokerRatioMap.get(ef.getBrokerBizId());
             String ratio = finalBrokerRatioMap.get(ef.getBrokerBizId());
             vo.setCommissionRatio(ratio);
             vo.setCommissionRatio(ratio);
 
 

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

@@ -334,6 +334,7 @@ public class FortuneVO implements Serializable {
         if (fortuneVO.getCurrentPaymentRatio() != null) {
         if (fortuneVO.getCurrentPaymentRatio() != null) {
             fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(fortuneVO.getCurrentPaymentRatio()));
             fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100).subtract(fortuneVO.getCurrentPaymentRatio()));
         } else {
         } else {
+            fortuneVO.setCurrentPaymentRatio(BigDecimal.ZERO);
             fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100));
             fortuneVO.setFortuneUnpaidRatio(BigDecimal.valueOf(100));
         }
         }
         fortuneVO.setFortunePaidAmount(fortune.getCurrentPaymentHkdAmount());
         fortuneVO.setFortunePaidAmount(fortune.getCurrentPaymentHkdAmount());