Ver código fonte

fix some bug

Mr.qian 3 semanas atrás
pai
commit
7dc6c2525c

+ 1 - 3
cif-service/src/main/java/com/txz/cif/web/AccountApiController.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.core.*;
-import com.txz.cif.enums.AccountFreezdTypeEnum;
 import com.txz.cif.model.Account;
 import com.txz.cif.model.AccountFlow;
 import com.txz.cif.model.AccountFreezd;
@@ -121,7 +120,7 @@ public class AccountApiController extends AbstractApiController {
         AccountWalletInfoBO bo = new AccountWalletInfoBO();
         bo.setBalance(wallet.getBalance());
         bo.setFreezeAmount(wallet.getFreezeAmount());
-        bo.setCanUserFreezeAmount(accountFreezdService.sumFreezdForRefundByUserId(userId));
+        bo.setCanUserFreezeAmount(wallet.getBalance().subtract(wallet.getFreezeAmount()));
         return ResultGenerator.genSuccessResult(bo);
     }
     
@@ -138,7 +137,6 @@ public class AccountApiController extends AbstractApiController {
         
         Condition c = new Condition(AccountFreezd.class);
         c.createCriteria()
-                .andEqualTo("type", AccountFreezdTypeEnum.REFUND_FREEZE)
                 .andIn("status", CollUtil.newArrayList(1, 2))
                 .andEqualTo("userId", userId)
         ;