Merge remote-tracking branch 'origin/test' into test

cif-api/src/main/java/com/txz/cif/param/CancelParam.java

@@ -1,9 +1,9 @@
 /*
-*
-* FreezdParam.java
-* Copyright(C) 2017-2020 fendo公司
-* @date 2022-11-02
-*/
+ *
+ * FreezdParam.java
+ * Copyright(C) 2017-2020 fendo公司
+ * @date 2022-11-02
+ */
 package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
@@ -41,22 +41,20 @@ public class CancelParam implements Serializable {
      * 开团人
      */
     private Long openGroupUserId;
-
-
+    
+    
     /**
      * 开团金额
      */
     private BigDecimal amount;
-
-
+    
+    
     /**
      * 交易时间
      */
     private Date transTime;
-
+    
     private static final long serialVersionUID = 1L;
-
-
-
-
+    
+    
 }

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

@@ -148,7 +148,8 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         for (Long userId : param.getUserIds()) {
             Result result = flowService.refund(RefundParam.builder()
                     .transTime(param.getTransTime())
-                    .bizType(BizTypeEnum.FAIL_GROUP_REFUND.getKey()).bizNo(param.getBizNo())
+                    .bizType(BizTypeEnum.FAIL_GROUP_REFUND.getKey())
+                    .bizNo(param.getBizNo())
                     .bizId(param.getBizId())
                     .amount(param.getAmount())
                     .userId(userId)
@@ -167,7 +168,8 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         for (OrderParam orderParam : param.getUserIds()) {
             Result result = flowService.refund(RefundParam.builder()
                     .transTime(param.getTransTime())
-                    .bizType(BizTypeEnum.SUCCESS_GROUP_REFUND.getKey()).bizNo(param.getBizNo())
+                    .bizType(BizTypeEnum.SUCCESS_GROUP_REFUND.getKey())
+                    .bizNo(orderParam.getOrderNo())
                     .bizId(param.getBizId())
                     .amount(param.getAmount())
                     .userId(orderParam.getUserId())

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

@@ -287,7 +287,9 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
         // 借：个人账户钱包（贷）     -500元
         // 贷：平台主营收入（贷）   +500元
         Date today = DateUtil.date();
-        Flow flow = Flow.builder().amount(param.getAmount()).bizType(param.getBizType())
+        Flow flow = Flow.builder()
+                .amount(param.getAmount())
+                .bizType(param.getBizType())
                 .userId(param.getUserId())
                 .bizNo(param.getBizNo())
                 .createTime(today)
@@ -296,21 +298,44 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
                 .debitAccount(account.getId())
                 .creditAccount(MyConstants.INNER_INCOME)
                 .createUser(param.getUserId() + "")
-                .bizId(param.getBizId()).type(6)
+                .bizId(param.getBizId())
+                .type(6)
                 .build();
         saveUseGeneratedKeys(flow);
         // 借：个人账户钱包（贷）     -500元
-        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()).userId(flow.getUserId())
-                .flowType(6).type(1).bizType(param.getBizType()).flowId(flow.getId()).build());
+        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())
+                .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()).userId(flow.getUserId())
-                .flowType(6).type(2).bizType(param.getBizType()).flowId(flow.getId()).build());
+        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())
+                .userId(flow.getUserId())
+                .flowType(6)
+                .type(2)
+                .bizType(param.getBizType())
+                .flowId(flow.getId())
+                .build()
+        );
         return Result.genSuccessResult();
     }
     
@@ -502,8 +527,9 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
             accountFreezd.setUnfreezeAmount(accountFreezd.getUnfreezeAmount().add(partialThawAmount));
             accountFreezd.setUpdateTime(new Date());
             accountFreezdService.update(accountFreezd);
+            // 解冻账户金额
             Account account = accountService.getAccount(accountFreezd.getUserId(), 1);
-            account.setFreezeAmount(account.getFreezeAmount().subtract(partialThawAmount.subtract(canUseAmount)));
+            account.setFreezeAmount(account.getFreezeAmount().subtract(partialThawAmount));
             accountService.update(account);
             return BigDecimal.ZERO;
         }

cif-service/src/main/java/com/txz/cif/web/bo/UserDetailBo.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import javax.persistence.Column;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -103,4 +102,9 @@ public class UserDetailBo {
 
     @ApiModelProperty(value="是否有下单权限 1是 2否")
     private Integer hasOrder;
+    
+    /**
+     * 邀请码
+     */
+    private String invitedCode;
 }

cif-service/src/main/java/com/txz/cif/web/vo/AccountFreezdVO.java

@@ -16,8 +16,8 @@ import java.util.Date;
 @NoArgsConstructor
 public class AccountFreezdVO {
     
-     private Long id;
-
+    private Long id;
+    
     /**
      * 用户id
      */
@@ -27,27 +27,27 @@ public class AccountFreezdVO {
      * 账户id
      */
     private Long accountId;
-
+    
     /**
      * 流水号
      */
     private Long bizId;
-
+    
     /**
      * 冻结金额
      */
     private BigDecimal amount;
-
+    
     /**
      * 解冻金额
      */
     private BigDecimal unfreezeAmount;
-
+    
     /**
      * 状态 1冻结中 2部分冻结 3已解冻
      */
     private Integer status;
-
+    
     /**
      * 创建时间
      */
@@ -64,4 +64,10 @@ public class AccountFreezdVO {
     private Date unfreezeTime;
     
     private BigDecimal freezeAmount;
+    
+    /**
+     * 业务单号
+     */
+    private String bizNo;
+    
 }