bug修复

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -183,11 +183,11 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                 //账户余额
                 runningWaterRecord.setAccountBalance(account.getAccountBalance());
                 //冻结金额
-                runningWaterRecord.setFrozenBalance(account.getFrozenBalance().add(caseOutBalance));
+                runningWaterRecord.setFrozenBalance(account.getFrozenBalance());
                 //扣除金额
                 runningWaterRecord.setTakeOutBalance(BigDecimal.ZERO);
                 //可用余额
-                runningWaterRecord.setUsableBalance(account.getUsableBalance().subtract(caseOutBalance));
+                runningWaterRecord.setUsableBalance(account.getUsableBalance());
 
                 runningWaterRecord.setOwnerUserNo(param.getOwnerUserNo());
                 runningWaterRecord.setAccountType(param.getAccountType());
@@ -367,7 +367,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             update.setId(account.getId());
             update.setModifiedTime(account.getModifiedTime());
             Integer flag = ownerAccountDao.updateOwnerAccountForConfirm(update);
-            if (flag > 0) {
+            if (flag != null && flag > 0) {
                 account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(ownerCaseOut.getOwnerUserNo(), ownerCaseOut.getAccountType());
                 //插入提现成功流水
                 OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();