回款确认问题处理

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -223,23 +223,25 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
     @DSTransactional
     @Override
     public void claimConfirm(ClaimDto dto) {
+        Claim claimInfo = getById(dto.getId());
+
         //创建流水
         AccountRunningWater accountRunningWater = new AccountRunningWater();
-        accountRunningWater.setCompanyId(dto.getCompanyId());
-        accountRunningWater.setAccountManagementId(dto.getAccountManagementId());
+        accountRunningWater.setCompanyId(claimInfo.getCompanyId());
+        accountRunningWater.setAccountManagementId(claimInfo.getAccountManagementId());
         accountRunningWater.setStatus("10");// 收入
-        accountRunningWater.setBusinessId(dto.getId());
-        accountRunningWater.setAmount(dto.getAmount());
-        accountRunningWater.setCurrency("CNY");
+        accountRunningWater.setBusinessId(claimInfo.getId());
+        accountRunningWater.setAmount(claimInfo.getAmount());
+        accountRunningWater.setCurrency(claimInfo.getCurrency());
         accountRunningWater.setReceived("10");// 合同到账（10:是，20:否）
-        accountRunningWater.setName(dto.getName());
-        accountRunningWater.setOpeningBank(dto.getOpeningBank());
-        accountRunningWater.setAccountOpening(dto.getAccountOpening());
+        accountRunningWater.setName(claimInfo.getName());
+        accountRunningWater.setOpeningBank(claimInfo.getOpeningBank());
+        accountRunningWater.setAccountOpening(claimInfo.getAccountOpening());
         accountRunningWater.setType("20"); // 添加流水类型 10 打款  20 到款登记
-        accountRunningWater.setTransactionTime(dto.getTransactionTime());
+        accountRunningWater.setTransactionTime(claimInfo.getTransactionTime());
 
         accountRunningWater.setIsClaim(1);
-        accountRunningWater.setClaimId(dto.getId());
+        accountRunningWater.setClaimId(claimInfo.getId());
         accountRunningWater.setConfirmRemark(dto.getConfirmRemark());
         //操作余额
         accountRunningWaterService.changeRemainder(accountRunningWater);
@@ -250,6 +252,7 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
                 .eq(Claim::getId, dto.getId())
                 .set(Claim::getBusinessId, accountRunningWater.getId())
                 .set(Claim::getConfirmStatus, 1)
+                .set(Claim::getConfirmRemark, dto.getConfirmRemark())
                 .set(BasePo::getUpdateUser, SecurityUtils.getUserId())
                 .set(BasePo::getUpdateTime, new Date())
         );