BUG

cif-service/src/main/java/com/txz/cif/service/impl/FlowServiceImpl.java

@@ -5,6 +5,7 @@ import com.txz.cif.constants.MyConstants;
 import com.txz.cif.core.ServiceException;
 import com.txz.cif.dao.FlowMapper;
 import com.txz.cif.dto.Result;
+import com.txz.cif.enums.BizTypeEnum;
 import com.txz.cif.model.*;
 import com.txz.cif.param.*;
 import com.txz.cif.service.AccountFlowService;
@@ -167,30 +168,33 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
                 .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(1).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
 
-        //充值返点
-        Account innerRebateAccount = accountService.findById(MyConstants.INNER_REBATE);
-        if (innerCapitalAccount == null){
-            return Result.genFailResult("账号未找到");
+
+        if (param.getDiscount().compareTo(BigDecimal.ZERO) > 0){
+            //充值返点
+            Account innerRebateAccount = accountService.findById(MyConstants.INNER_REBATE);
+            if (innerCapitalAccount == null){
+                return Result.genFailResult("账号未找到");
+            }
+            flow = Flow.builder().amount(param.getDiscount()).bizType(BizTypeEnum.REFUND_RECHARGE.getKey())
+                    .userId(param.getUserId())
+                    .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
+                    .debitAccount(MyConstants.INNER_REBATE).creditAccount(account.getId())
+                    .bizId(param.getBizId()).type(10)
+                    .build();
+            saveUseGeneratedKeys(flow);
+            //借 ：平台资金银行xx元  内部户1（资产类：借方账户）+钱
+            accountService.deal(AccountFlow.builder().accountId(MyConstants.INNER_REBATE).amount(flow.getAmount())
+                    .bizId(flow.getBizId()).aliases(innerRebateAccount.getAliases()).transTime(param.getTransTime())
+                    .bizNo(flow.getBizNo()).balance(innerRebateAccount.getBalance().add(flow.getAmount()))
+                    .freezeAmount(innerRebateAccount.getFreezeAmount()).userId(flow.getUserId())
+                    .flowType(1).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
+            //贷 ：客户资金账户xx元 客户账号(负债类：贷方账户)+钱
+            accountService.deal(AccountFlow.builder().accountId(account.getId()).amount(flow.getAmount())
+                    .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(param.getTransTime())
+                    .bizNo(flow.getBizNo()).balance(account.getBalance().add(flow.getAmount()))
+                    .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
+                    .flowType(1).type(2).bizType(10).flowId(flow.getId()).build());
         }
-        flow = Flow.builder().amount(param.getDiscount()).bizType(10)
-                .userId(param.getUserId())
-                .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
-                .debitAccount(MyConstants.INNER_REBATE).creditAccount(account.getId())
-                .bizId(param.getBizId()).type(10)
-                .build();
-        saveUseGeneratedKeys(flow);
-        //借 ：平台资金银行xx元  内部户1（资产类：借方账户）+钱
-        accountService.deal(AccountFlow.builder().accountId(MyConstants.INNER_REBATE).amount(flow.getAmount())
-                .bizId(flow.getBizId()).aliases(innerRebateAccount.getAliases()).transTime(param.getTransTime())
-                .bizNo(flow.getBizNo()).balance(innerRebateAccount.getBalance().add(flow.getAmount()))
-                .freezeAmount(innerRebateAccount.getFreezeAmount()).userId(flow.getUserId())
-                .flowType(1).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
-        //贷 ：客户资金账户xx元 客户账号(负债类：贷方账户)+钱
-        accountService.deal(AccountFlow.builder().accountId(account.getId()).amount(flow.getAmount())
-                .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(param.getTransTime())
-                .bizNo(flow.getBizNo()).balance(account.getBalance().add(flow.getAmount()))
-                .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
-                .flowType(1).type(2).bizType(10).flowId(flow.getId()).build());
 
 
         return Result.genSuccessResult();

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

@@ -135,7 +135,8 @@ public class AccountApiController extends AbstractApiController {
 		}
 		PageHelper.startPage(param.getPage(), param.getSize());
 		Condition c = new Condition(AccountFlow.class);
-		Criteria criteria = c.createCriteria().andEqualTo("userId",user.getId());
+		Criteria criteria = c.createCriteria().andEqualTo("userId",user.getId())
+				.andEqualTo("aliases","202");
 		if (param.getType() == 1 ){
 			criteria.andGreaterThanOrEqualTo("createTime", DateUtil.today());
 		} else if (param.getType() == 2){