Merge remote-tracking branch 'origin/master'

cif-service/src/main/java/com/txz/cif/dubbo/impl/AccountDubboServiceImpl.java

@@ -131,7 +131,7 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         Result result = flowService.pay(PayParam.builder().bizNo(param.getBizNo())
                 .amount(param.getAmount())
                 .bizId(param.getBizId())
-                        .userId(param.getUserId())
+                .userId(param.getUserId())
                 .transTime(param.getTransTime())
                 .bizType(BizTypeEnum.JOIN_GROUP_PAY.getKey())
                 .build());

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

@@ -54,11 +54,11 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
             Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
                     .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                     .debitAccount(account.getId()).creditAccount(account.getId())
-                    .bizId(param.getBizId()).type(4)
+                    .bizId(param.getBizId()).type(4).userId(param.getUserId())
                     .build();
             saveUseGeneratedKeys(flow);
             accountService.deal(AccountFlow.builder().accountId(account.getId()).amount(flow.getAmount())
-                    .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(param.getTransTime())
+                    .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(param.getTransTime()).userId(flow.getUserId())
                     .bizNo(flow.getBizNo()).balance(account.getBalance()).freezeAmount(account.getFreezeAmount().add(param.getAmount()))
                     .flowType(4).type(1).bizType(param.getBizType()).flowId(flow.getId()).build());
             AccountFreezd freezd = AccountFreezd.builder().accountId(account.getId()).bizId(flow.getId())
@@ -92,11 +92,11 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         Flow flow = Flow.builder().amount(freezd.getAmount()).bizType(5001)
                 .bizNo(oldFlow.getBizNo()).createTime(today).updateTime(today).transTime(today)
                 .debitAccount(oldFlow.getDebitAccount()).creditAccount(oldFlow.getCreditAccount())
-                .bizId(oldFlow.getBizId()).type(5)
+                .bizId(oldFlow.getBizId()).type(5).userId(account.getUserId())
                 .build();
         saveUseGeneratedKeys(flow);
         accountService.deal(AccountFlow.builder().accountId(oldFlow.getDebitAccount()).amount(flow.getAmount())
-                .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(today)
+                .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(today).userId(flow.getUserId())
                 .bizNo(flow.getBizNo()).balance(account.getBalance()).freezeAmount(account.getFreezeAmount().subtract(oldFlow.getAmount()))
                 .flowType(5).type(2).bizType(flow.getBizType()).flowId(flow.getId()).build());
         accountFreezdService.update(AccountFreezd.builder().id(freezdId).status(3).unfreezeAmount(oldFlow.getAmount()).build());
@@ -151,20 +151,20 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                 .debitAccount(MyConstants.INNER_MARKETING).creditAccount(account.getId())
-                .bizId(param.getBizId()).type(1)
+                .bizId(param.getBizId()).type(1).userId(param.getUserId())
                 .build();
         saveUseGeneratedKeys(flow);
         //借 ：平台营销账户（负债类）xx元  平台营销账户（负债类）+钱
         accountService.deal(AccountFlow.builder().accountId(MyConstants.INNER_MARKETING).amount(flow.getAmount())
                 .bizId(flow.getBizId()).aliases(innerCapitalAccount.getAliases()).transTime(param.getTransTime())
                 .bizNo(flow.getBizNo()).balance(innerCapitalAccount.getBalance().add(flow.getAmount()))
-                .freezeAmount(innerCapitalAccount.getFreezeAmount())
+                .freezeAmount(innerCapitalAccount.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())
+                .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(1).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
 
         //充值返点
@@ -183,13 +183,13 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         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())
+                .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())
+                .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(1).type(2).bizType(10).flowId(flow.getId()).build());
 
 
@@ -222,13 +222,13 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         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().subtract(flow.getAmount()))
-                .freezeAmount(account.getFreezeAmount())
+                .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(6).type(1).bizType(param.getBizType()).flowId(flow.getId()).build());
         //贷：平台主营收入（贷）   +500元
         accountService.deal(AccountFlow.builder().accountId(MyConstants.INNER_INCOME).amount(flow.getAmount())
                 .bizId(flow.getBizId()).aliases(innerIncomeAccount.getAliases()).transTime(param.getTransTime())
                 .bizNo(flow.getBizNo()).balance(innerIncomeAccount.getBalance().add(flow.getAmount()))
-                .freezeAmount(innerIncomeAccount.getFreezeAmount())
+                .freezeAmount(innerIncomeAccount.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(6).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
         return Result.genSuccessResult();
     }
@@ -259,13 +259,13 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         accountService.deal(AccountFlow.builder().accountId(MyConstants.INNER_REFUND).amount(flow.getAmount())
                 .bizId(flow.getBizId()).aliases(innerRefundAccount.getAliases()).transTime(param.getTransTime())
                 .bizNo(flow.getBizNo()).balance(innerRefundAccount.getBalance().add(flow.getAmount()))
-                .freezeAmount(innerRefundAccount.getFreezeAmount())
+                .freezeAmount(innerRefundAccount.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(7).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
         //贷：个人账户（贷）  +100元
         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())
+                .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(7).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
         return Result.genSuccessResult();
     }
@@ -295,13 +295,13 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         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().subtract(flow.getAmount()))
-                .freezeAmount(account.getFreezeAmount())
+                .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(3).type(1).bizType(param.getBizType()).flowId(flow.getId()).build());
         //贷 ：资金应收-渠道款-银行xx元  内部户1（资产类：借方账户）-钱
         accountService.deal(AccountFlow.builder().accountId(MyConstants.INNER_CAPITAL).amount(flow.getAmount())
                 .bizId(flow.getBizId()).aliases(innerCapitalAccount.getAliases()).transTime(param.getTransTime())
                 .bizNo(flow.getBizNo()).balance(innerCapitalAccount.getBalance().subtract(flow.getAmount()))
-                .freezeAmount(innerCapitalAccount.getFreezeAmount())
+                .freezeAmount(innerCapitalAccount.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(3).type(1).bizType(param.getBizType()).flowId(flow.getId()).build());
         return Result.genSuccessResult();
     }
@@ -320,20 +320,20 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         Flow flow = Flow.builder().amount(redEnvelope.getAmount()).bizType(redEnvelope.getBizType())
                 .bizNo(redEnvelope.getOrderNo()).createTime(today).updateTime(today).transTime(redEnvelope.getTransTime())
                 .debitAccount(MyConstants.INNER_RED).creditAccount(account.getId())
-                .bizId(redEnvelope.getId()+"").type(1)
+                .bizId(redEnvelope.getId()+"").type(1).userId(redEnvelope.getUserId())
                 .build();
         saveUseGeneratedKeys(flow);
         //借 ：主营业务支出-红包（损益类）xx元  主营业务支出-红包（损益类）+钱
         accountService.deal(AccountFlow.builder().accountId(MyConstants.INNER_RED).amount(flow.getAmount())
                 .bizId(flow.getBizId()).aliases(innerCapitalAccount.getAliases()).transTime(redEnvelope.getTransTime())
                 .bizNo(flow.getBizNo()).balance(innerCapitalAccount.getBalance().add(flow.getAmount()))
-                .freezeAmount(innerCapitalAccount.getFreezeAmount())
+                .freezeAmount(innerCapitalAccount.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(1).type(2).bizType(redEnvelope.getBizType()).flowId(flow.getId()).build());
         //贷 ：客户资金账户xx元 客户账号(负债类：贷方账户)+钱
         accountService.deal(AccountFlow.builder().accountId(account.getId()).amount(flow.getAmount())
                 .bizId(flow.getBizId()).aliases(account.getAliases()).transTime(redEnvelope.getTransTime())
                 .bizNo(flow.getBizNo()).balance(account.getBalance().add(flow.getAmount()))
-                .freezeAmount(account.getFreezeAmount())
+                .freezeAmount(account.getFreezeAmount()).userId(flow.getUserId())
                 .flowType(1).type(2).bizType(redEnvelope.getBizType()).flowId(flow.getId()).build());
         return Result.genSuccessResult();
     }