后台管理 新增 2.钱包可用余额；3.钱包冻结金额

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

@@ -21,61 +21,67 @@ public class UserBo2 {
      */
     @ApiModelProperty(value = "用户id")
     private Long id;
-    
+
     /**
      * 用户号
      */
     private String userNo;
-    
+
     @ApiModelProperty("名称")
     private String nickname;
-    
+
     @ApiModelProperty("名称")
     private String name;
-    
+
     @ApiModelProperty("头像")
     private String headPic;
-    
+
     @ApiModelProperty(value = "状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
-    
+
     private String phoneNo;
-    
+
     /**
      * token
      */
     @ApiModelProperty(value = "vip")
     private Integer vipLevel;
-    
+
     @ApiModelProperty(value = "备注")
     private String memo;
-    
+
     @ApiModelProperty(value = "邀请好友数")
     private Integer inviteNum;
-    
+
     @ApiModelProperty(value = "团队人数")
     private Integer teamNum;
-    
-    
+
+
     @ApiModelProperty(value = "成团数")
     private Integer successGroupNum;
-    
+
     @ApiModelProperty(value = "钱包余额")
     private BigDecimal walletBalance;
-    
+
+    @ApiModelProperty(value="freezeAmount冻结金额")
+    private BigDecimal freezeAmount;
+
+    @ApiModelProperty(value="可用金额")
+    private BigDecimal availableAmount;
+
     @ApiModelProperty(value = "收益余额")
     private BigDecimal earningsBalance;
-    
+
     @ApiModelProperty(value = "createTime创建时间")
     private Date createTime;
-    
+
     @ApiModelProperty(value = "是否有提现权限 1是 2否")
     private Integer hasWithdraw;
-    
+
     @ApiModelProperty(value = "是否有登录权限 1是 2否")
     private Integer hasLogin;
-    
+
     @ApiModelProperty(value = "是否有下单权限 1是 2否")
     private Integer hasOrder;
-    
+
 }

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

@@ -75,6 +75,12 @@ public class UserDetailBo {
     @ApiModelProperty(value="钱包余额")
     private BigDecimal walletBalance;
 
+    @ApiModelProperty(value="freezeAmount冻结金额")
+    private BigDecimal freezeAmount;
+
+    @ApiModelProperty(value="可用金额")
+    private BigDecimal availableAmount;
+
     @ApiModelProperty(value="收益余额")
     private BigDecimal earningsBalance;
 
@@ -102,7 +108,7 @@ public class UserDetailBo {
 
     @ApiModelProperty(value="是否有下单权限 1是 2否")
     private Integer hasOrder;
-    
+
     /**
      * 邀请码
      */

cif-service/src/main/java/com/txz/cif/web/mng/UserController.java

@@ -40,26 +40,26 @@ import java.util.stream.Collectors;
 @Api(tags = "[后台]用户管理")
 @Slf4j
 public class UserController extends AbstractApiController {
-    
+
     @Resource
     private RedisUtil redisUtil;
-    
+
     @Resource
     private UserService userService;
-    
+
     @Resource
     private FlowService flowService;
-    
+
     @Resource
     private AccountService accountService;
-    
+
     @Resource
     private RedEnvelopeService redEnvelopeService;
-    
+
     @Resource
     private ConfigMemberService configMemberService;
-    
-    
+
+
     @PostMapping("/update")
     @ApiOperation(value = "更新用户资料", httpMethod = "POST")
     public Result update(@RequestBody UserUpdateParam param) {
@@ -81,7 +81,7 @@ public class UserController extends AbstractApiController {
         userService.update(temp);
         return ResultGenerator.genSuccessResult();
     }
-    
+
     @PostMapping("/list")
     @ApiOperation(value = "获取用户", httpMethod = "POST")
     public Result<List<UserBo2>> list(@RequestBody MyUserParam param) {
@@ -120,7 +120,7 @@ public class UserController extends AbstractApiController {
         if (StrUtil.isNotBlank(param.getEndTime())) {
             criteria.andLessThanOrEqualTo("createTime", param.getEndTime());
         }
-        
+
         PageInfo pageInfo = null;
         try {
             condition.setOrderByClause("create_time desc");
@@ -160,9 +160,11 @@ public class UserController extends AbstractApiController {
                 // 钱包余额
                 Account wallet = accountService.getAccount(u.getId(), 1);
                 bo.setWalletBalance(wallet.getBalance());
+                bo.setFreezeAmount(wallet.getFreezeAmount());
+                bo.setAvailableAmount(wallet.getBalance().subtract(wallet.getFreezeAmount()));
                 Account earnings = accountService.getAccount(u.getId(), 2);
                 bo.setEarningsBalance(earnings.getBalance());
-                
+
                 return bo;
             }).collect(Collectors.toList()));
         } catch (Exception e) {
@@ -171,7 +173,7 @@ public class UserController extends AbstractApiController {
         }
         return ResultGenerator.genSuccessResult(pageInfo);
     }
-    
+
     @GetMapping("/detail")
     @ApiOperation(value = "获取用户详情", httpMethod = "GET")
     public Result<UserDetailBo> list(@RequestParam Long userId) {
@@ -206,15 +208,17 @@ public class UserController extends AbstractApiController {
         // 钱包余额
         Account wallet = accountService.getAccount(u.getId(), 1);
         bo.setWalletBalance(wallet.getBalance());
+        bo.setFreezeAmount(wallet.getFreezeAmount());
+        bo.setAvailableAmount(wallet.getBalance().subtract(wallet.getFreezeAmount()));
         Account earnings = accountService.getAccount(u.getId(), 2);
         bo.setEarningsBalance(earnings.getBalance());
-        
+
         //  可参团数
         ConfigMember member = configMemberService.findBy("level", u.getVipLevel());
         bo.setGroupNum(member.getJoinedGroupsNo());
         BigDecimal totalEarnings = redEnvelopeService.sumWithDay(null, u.getId(), 3);
         bo.setTotalEarnings(totalEarnings);
-        
+
         c = new Condition(Flow.class);
         c.createCriteria().andGreaterThanOrEqualTo("createTime", DateUtil.today())
                 .andIn("bizType", CollUtil.newArrayList(BizTypeEnum.OPEN_GROUP_PAY.getKey(), BizTypeEnum.JOIN_GROUP_PAY.getKey()));
@@ -243,8 +247,8 @@ public class UserController extends AbstractApiController {
         bo.setVipLevel(u.getVipLevel());
         return ResultGenerator.genSuccessResult(bo);
     }
-    
-    
+
+
     @PostMapping("/myUsers")
     @ApiOperation(value = "获取我的下级用户和下下级", httpMethod = "POST")
     public Result<List<User>> myUsers(@RequestBody MyUserParam param) {
@@ -271,7 +275,7 @@ public class UserController extends AbstractApiController {
         if (StrUtil.isNotBlank(param.getEndTime())) {
             criteria.andLessThanOrEqualTo("createTime", param.getEndTime());
         }
-        
+
         PageInfo pageInfo = null;
         try {
             List<User> list = userService.findByCondition(condition);
@@ -286,7 +290,7 @@ public class UserController extends AbstractApiController {
         }
         return ResultGenerator.genSuccessResult(pageInfo);
     }
-    
+
     @GetMapping("/report")
     @ApiOperation(value = "导出", httpMethod = "GET")
     public void report(
@@ -383,6 +387,6 @@ public class UserController extends AbstractApiController {
             log.info("导出结束");
         }
     }
-    
-    
+
+
 }