处理BUG

performance-web/src/main/java/com/clx/performance/dao/impl/OwnerRunningWaterRecordDaoImpl.java

@@ -3,6 +3,7 @@ package com.clx.performance.dao.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OwnerRunningWaterRecordDao;
+import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.mapper.OwnerRunningWaterRecordMapper;
 import com.clx.performance.model.OwnerRunningWaterRecord;
 import com.clx.performance.param.pc.PageOwnerAccountRunningWaterParam;
@@ -38,6 +39,7 @@ public class OwnerRunningWaterRecordDaoImpl extends BaseDaoImpl<OwnerRunningWate
     @Override
     public List<OwnerRunningWaterRecord> getOwnerRunningWaterRecord(String orderNo) {
         return baseMapper.selectList(lQrWrapper().eq(OwnerRunningWaterRecord::getOrderNo, orderNo)
+                        .eq(OwnerRunningWaterRecord::getRunningWaterType, OwnerAccountEnum.RunningWaterStatus.FROZEN.getCode())
                 .isNull(OwnerRunningWaterRecord::getOrderChildNo)
         );
     }

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

@@ -788,10 +788,12 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
                 for (OwnerRunningWaterRecord runningWaterRecord : list) {
                     OwnerAccount account = ownerAccountDao.getAccountByOwnerUserNoAndAccountType(runningWaterRecord.getOwnerUserNo(), runningWaterRecord.getAccountType());
                     OwnerAccount entity = new OwnerAccount();
-                    entity.setId(entity.getId());
-                    entity.setModifiedTime(entity.getModifiedTime());
+                    entity.setId(account.getId());
+                    entity.setModifiedTime(account.getModifiedTime());
                     entity.setAccountBalance(runningWaterRecord.getAlterationBalance());
-                    flag += ownerAccountDao.thawAccount(account, LocalDateTime.now());
+                    entity.setUsableBalance(runningWaterRecord.getAlterationBalance());
+                    entity.setFrozenBalance(runningWaterRecord.getAlterationBalance());
+                    flag += ownerAccountDao.thawAccount(entity, LocalDateTime.now());
                 }
                 if (flag == 2) {
                     log.info("解冻预付运费、保证金账户，账户扣款已处理，开始执行插入相关流水");