新增出账更新到应付

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

@@ -460,7 +460,7 @@ public class ApiExpectedFortuneServiceImpl implements ApiExpectedFortuneService
     }
     }
 
 
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
-    private void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, String policyCurrency, List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList) {
+    public void updateHkdAmountBatch(List<ExpectedFortune> expectedFortuneList, String policyCurrency, List<ApiAnnouncementCommissionRatioListResponse> announcementRatioList) {
 
 
         log.info("------------------------开始计算默认结算汇率、港币金额----------------------");
         log.info("------------------------开始计算默认结算汇率、港币金额----------------------");
 
 

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

@@ -770,6 +770,8 @@ public class FortuneServiceImpl extends ServiceImpl<FortuneMapper, Fortune>
         ExpectedFortune updateObj = new ExpectedFortune();
         ExpectedFortune updateObj = new ExpectedFortune();
         updateObj.setId(expectedFortune.getId());
         updateObj.setId(expectedFortune.getId());
         updateObj.setHkdAmount(expectedFortune.getHkdAmount().add(hkdAmount));
         updateObj.setHkdAmount(expectedFortune.getHkdAmount().add(hkdAmount));
+        updateObj.setUnpaidAmount(hkdAmount.add(expectedFortune.getUnpaidAmount()));
+        updateObj.setUnpaidRatio(updateObj.getUnpaidAmount().divide(updateObj.getHkdAmount(), 4, RoundingMode.HALF_UP));
 
 
         // 根据预计出账币种计算 expectedFortune.getAmount() 字段
         // 根据预计出账币种计算 expectedFortune.getAmount() 字段
         BigDecimal originalAmount = fortune.getAmount();  // 原始币种金额
         BigDecimal originalAmount = fortune.getAmount();  // 原始币种金额