生成预计发佣记录是查询出账币种、默认结算汇率

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

@@ -322,13 +322,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
                 List<ExpectedFortune> expectedFortuneList = updatePayableNoBatch(policyNo);
 
                 //默认结算汇率、港币金额
-                if (CollUtil.isNotEmpty(queryPolicyAndBrokerDtoList)) {
-
-                    log.info("queryPolicyAndBrokerDtoList: {}", queryPolicyAndBrokerDtoList);
-
-                    QueryPolicyAndBrokerDto queryPolicyAndBrokerDto = queryPolicyAndBrokerDtoList.get(0);
-                    updateHkdAmountBatch(expectedFortuneList, queryPolicyAndBrokerDto);
-                }
+                updateHkdAmountBatch(expectedFortuneList, queryPolicyAndBrokerDtoList.get(0));
 
                 //执行成功完毕，也要销毁redis缓存
                 redisUtil.deleteObject(RedisConstants.EXPECTED_FORTUNE + policyNo);
@@ -358,6 +352,9 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
     }
 
     private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, QueryPolicyAndBrokerDto queryPolicyAndBrokerDto) {
+
+        log.info("------------------------开始计算默认结算汇率、港币金额----------------------");
+
         //查询结算币种
         ApiAnnouncementCommissionRatioListRequest request = new ApiAnnouncementCommissionRatioListRequest();
         request.setProductLaunchBizId(queryPolicyAndBrokerDto.getPlanBizId());
@@ -455,13 +452,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
 
 
                 //默认结算汇率、港币金额
-                if (ObjectUtils.isNotEmpty(queryPolicyAndBrokerDtoList)) {
-
-                    log.info("------------------------开始计算默认结算汇率、港币金额----------------------");
-
-                    QueryPolicyAndBrokerDto queryPolicyAndBrokerDto = queryPolicyAndBrokerDtoList.get(0);
-                    updateHkdAmountBatch(expectedFortuneList, queryPolicyAndBrokerDto);
-                }
+                updateHkdAmountBatch(expectedFortuneList, queryPolicyAndBrokerDtoList.get(0));
 
                 //执行成功完毕，也要销毁redis缓存
                 redisUtil.deleteObject(RedisConstants.EXPECTED_FORTUNE + policyNo);

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

@@ -28,15 +28,12 @@ import com.yd.csf.service.vo.CommissionStatisticsVO;
 import com.yd.csf.service.vo.CommissionVO;
 import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
 import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
-import com.yd.user.feign.client.sysdict.ApiSysDictFeignClient;
-import com.yd.user.feign.response.sysdict.GetDictItemListByDictTypeResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronization;
@@ -636,7 +633,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
             if (StringUtils.isBlank(expectedFortune.getCurrency())) {
                 throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计发佣记录" + expectedFortune.getExpectedFortuneBizId() + "未配置出账币种");
             }
-            if (BigDecimal.ZERO.equals(expectedFortune.getDefaultExchangeRate())) {
+            if (expectedFortune.getDefaultExchangeRate() == null) {
                 throw new BusinessException(ResultCode.NULL_ERROR.getCode(), "预计发佣记录" + expectedFortune.getExpectedFortuneBizId() + "未配置默认结算汇率");
             }
         }