后端接口

cif-service/src/main/java/com/txz/cif/model/User.java

@@ -3,8 +3,6 @@ package com.txz.cif.model;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.txz.cif.web.bo.UserInfoBO;
-import com.txz.cif.web.bo.UserVo;
-import com.txz.core.BaseBeen;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -85,9 +83,9 @@ public class User  {
     private Byte sex;
 
     /**
-     * 状态  1正常 2禁用 3停用 4锁定
+     * 状态  1正常 2禁止提现 3禁止登录 4禁止下单
      */
-    @ApiModelProperty(value="status状态  1正常 2禁用 3停用 4锁定")
+    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
 
     /**
@@ -205,10 +203,5 @@ public class User  {
         return bo;
     }
 
-    public UserVo generatorVo() {
-        UserVo bo = BeanUtil.toBean(this,UserVo.class);
-        bo.setUserId(this.id);
-        bo.setSseId(SecureUtil.md5("sse" + this.id));
-        return bo;
-    }
+
 }

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

@@ -1,54 +0,0 @@
-package com.txz.cif.web.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel(value="组织")
-public class OrgBO {
-    @ApiModelProperty(value="组织id")
-    private Long orgId;
-
-    /**
-     * 组织名称
-     */
-    @ApiModelProperty(value="name组织名称")
-    private String name;
-
-    @ApiModelProperty(value="type类型 1群组 2专家")
-    private Integer type;
-
-    @ApiModelProperty(value="系统分类 多个分类 使用 , 分割")
-    private String sysTypes;
-
-    @ApiModelProperty(value="专家id")
-    private Long userId;
-
-    @ApiModelProperty(value="notice公告")
-    private String notice;
-
-    /**
-     * 图标
-     */
-    @ApiModelProperty(value="icon图标")
-    private String icon;
-
-    /**
-     * 病例数
-     */
-    @ApiModelProperty(value="病例数")
-    private String num;
-
-    @ApiModelProperty(value="成员专家")
-    private List<UserVo> users;
-
-}

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

@@ -1,115 +0,0 @@
-package com.txz.cif.web.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.util.Date;
-import java.util.List;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="用户组资料")
-public class OrgInfoBO {
-    @ApiModelProperty(value="userId")
-    private Long userId;
-
-    @ApiModelProperty(value="组织id")
-    private Long orgId;
-
-    @ApiModelProperty(value="结算方案id")
-    private Long settlePlanId;
-
-    @ApiModelProperty(value="登录账号")
-    private String loginAccount;
-
-    /**
-     * 名字
-     */
-    @ApiModelProperty(value="name名字")
-    private String name;
-
-    /**
-     * 状态 1正常 2禁用
-     */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
-    private Byte status;
-
-    @ApiModelProperty(value="特长")
-    private String strong;
-
-    @ApiModelProperty(value="所属系统多个使用，分割")
-    private String sysTypes;
-
-    @ApiModelProperty(value="type类型 1群组 2专家")
-    private Integer type;
-
-    /**
-     * 头像
-     */
-    @ApiModelProperty(value="icon")
-    private String icon;
-
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value="地址")
-    private String address;
-
-    /**
-     * 所属省份代码
-     */
-    @ApiModelProperty(value="provinceCode所属省份代码")
-    private String provinceCode;
-
-    /**
-     * 所属城市码
-     */
-    @ApiModelProperty(value="cityCode所属城市码")
-    private String cityCode;
-
-    @ApiModelProperty(value="手机")
-    private String phoneNo;
-
-    @ApiModelProperty(value="密码")
-    private String password;
-
-    @ApiModelProperty(value="邮箱")
-    private String email;
-
-    @ApiModelProperty(value="notice公告")
-    private String notice;
-
-    /**
-     * 所属区域代码
-     */
-    @ApiModelProperty(value="areaCode所属区域代码")
-    private String areaCode;
-
-    @ApiModelProperty(value="区域名称")
-    private String  areaName;
-
-    /**
-     * 简介
-     */
-    @ApiModelProperty(value="简介")
-    private String introductory;
-
-    @ApiModelProperty(value="成员专家")
-    private List<UserVo> users;
-
-    @ApiModelProperty(value="结算方案")
-    private SettlePlanBO settlePlan;
-
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value="updateTime更新时间")
-    private Date updateTime;
-}

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Getter
 @Setter
@@ -26,7 +27,7 @@ public class UserBo2 {
     @ApiModelProperty("头像")
     private String headPic;
 
-    @ApiModelProperty(value="status状态  1正常 2禁用 3停用 4锁定")
+    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
 
     private String phoneNo;
@@ -56,4 +57,9 @@ public class UserBo2 {
     @ApiModelProperty(value="收益余额")
     private BigDecimal earningsBalance;
 
+    @ApiModelProperty(value="createTime创建时间")
+    private Date createTime;
+
+
+
 }

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

@@ -0,0 +1,84 @@
+package com.txz.cif.web.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Getter
+@Setter
+@ToString
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("用户详情信息")
+public class UserDetailBo {
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    @ApiModelProperty(value="headPic头像")
+    private String headPic;
+
+    @ApiModelProperty(value="userId用户号")
+    private String userNo;
+    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
+    private Byte status;
+    @ApiModelProperty(value="nickname昵称")
+    private String nickname;
+
+    @ApiModelProperty(value="bank银行")
+    private String bank;
+    @ApiModelProperty(value="银行用户名称")
+    private String bankAccountName;
+    @ApiModelProperty(value="phoneNo电话")
+    private String phoneNo;
+
+    @ApiModelProperty(value="createTime创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value="bankAccount银行账号")
+    private String bankAccount;
+
+    //统计信息
+    @ApiModelProperty(value="邀请好友数")
+    private Integer inviteNum;
+
+    @ApiModelProperty(value="成团数")
+    private Integer successGroupNum;
+
+    @ApiModelProperty(value="可参团数")
+    private Integer groupNum;
+
+    @ApiModelProperty(value="总收益")
+    private BigDecimal totalEarnings;
+
+    @ApiModelProperty(value="已结算收益")
+    private BigDecimal settledEarnings;
+
+    @ApiModelProperty(value="充值")
+    private BigDecimal rechargeAmount;
+
+    @ApiModelProperty(value="团队人数")
+    private Integer teamNum;
+
+    @ApiModelProperty(value="钱包余额")
+    private BigDecimal balance;
+
+    @ApiModelProperty(value="收益余额")
+    private BigDecimal earningsBalance;
+
+    @ApiModelProperty(value="7日收益")
+    private BigDecimal L7DEarnings;
+
+    @ApiModelProperty(value="待结算金额")
+    private BigDecimal pendingEarnings;
+
+    @ApiModelProperty(value="提现总金额")
+    private BigDecimal withdrawAmount;
+
+}

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

@@ -1,49 +0,0 @@
-package com.txz.cif.web.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-@Getter
-@Setter
-@ToString
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-@ApiModel("用户常规信息")
-public class UserGeneralBo {
-    /**
-     * 用户id
-     */
-    @ApiModelProperty(value="用户id")
-    private Long userId;
-
-    @ApiModelProperty("名称")
-    private String name;
-
-    @ApiModelProperty("头像")
-    private String headPic;
-
-    private String habit;
-
-    /**
-     * 工作状态 1空闲 2不接诊
-     */
-    @ApiModelProperty(value="workStatus工作状态 1空闲 2不接诊")
-    private Byte workStatus;
-
-    @ApiModelProperty(value="所属系统多个使用，分割")
-    private String sysTypes;
-
-    /**
-     * 电话
-     */
-    @ApiModelProperty(value="phoneNo电话")
-    private String phoneNo;
-
-    /**
-     * 简介
-     */
-    @ApiModelProperty(value="简介")
-    private String introductory;
-}

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

@@ -18,11 +18,6 @@ public class UserInfoBO {
     @ApiModelProperty(value="userId")
     private Long userId;
 
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value="unit单位")
-    private String unit;
 
     /**
      * 名字
@@ -32,19 +27,12 @@ public class UserInfoBO {
 
     private String habit;
 
-    @ApiModelProperty(value="科室名称")
-    private String department;
 
-    /**
-     * 身份证号
-     */
-    @ApiModelProperty(value="identity身份证号")
-    private String identity;
 
     /**
-     * 状态 0未启用 1正常 2禁用 3停用 4锁定
+     * 状态  1正常 2禁止提现 3禁止登录 4禁止下单
      */
-    @ApiModelProperty(value="status状态 0未启用 1正常 2禁用 3停用 4锁定")
+    @ApiModelProperty(value="状态  1正常 2禁止提现 3禁止登录 4禁止下单")
     private Byte status;
 
 

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

@@ -1,87 +0,0 @@
-package com.txz.cif.web.bo;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="用户行信息")
-public class UserVo {
-    @ApiModelProperty(value="userId")
-    private Long userId;
-
-    /**
-     * 名字
-     */
-    @ApiModelProperty(value="name名字")
-    private String name;
-
-    private String habit;
-
-    /**
-     * 工作状态 1空闲 2不接诊
-     */
-    @ApiModelProperty(value="workStatus工作状态 1空闲 2不接诊")
-    private Byte workStatus;
-
-    @ApiModelProperty(value="所属系统多个使用，分割")
-    private String sysTypes;
-
-    @ApiModelProperty(value="status状态 0未启用 1正常 2禁用 3停用 4锁定")
-    private Byte status;
-
-    @ApiModelProperty(value="phoneNo电话")
-    private String phoneNo;
-
-    /**
-     * 头像
-     */
-    @ApiModelProperty(value="icon")
-    private String icon;
-
-    /**
-     * 居住地址
-     */
-    @ApiModelProperty(value="address居住地址")
-    private String address;
-
-    /**
-     * 性别 0未知 1男 2女
-     */
-    @ApiModelProperty(value="sex性别 0未知 1男 2女")
-    private Byte sex;
-
-    /**
-     * 所属省份代码
-     */
-    @ApiModelProperty(value="provinceCode所属省份代码")
-    private String provinceCode;
-
-    /**
-     * 所属城市码
-     */
-    @ApiModelProperty(value="cityCode所属城市码")
-    private String cityCode;
-
-    /**
-     * 所属区域代码
-     */
-    @ApiModelProperty(value="areaCode所属区域代码")
-    private String areaCode;
-
-    @ApiModelProperty(value="特长")
-    private String strong;
-
-    /**
-     * 简介
-     */
-    @ApiModelProperty(value="简介")
-    private String introductory;
-
-    @ApiModelProperty(value="站内信id")
-    private String sseId;
-}

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

@@ -15,6 +15,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.txz.cif.enums.BizTypeEnum;
 import com.txz.cif.util.IpUtils;
 import com.txz.cif.web.bo.UserBo;
 import com.txz.cif.web.bo.UserBo2;
@@ -49,6 +50,9 @@ public class UserController extends AbstractApiController {
     @Resource
     private FlowService flowService;
 
+    @Resource
+    private AccountService accountService;
+
 
     @PostMapping("/list")
     @ApiOperation(value = "获取用户",httpMethod = "POST")
@@ -99,10 +103,14 @@ public class UserController extends AbstractApiController {
                 bo.setTeamNum(inviteNum+inviteNextNum);
                 //付款过的订单
                 c  = new Condition(Flow.class);
-                c.createCriteria().andEqualTo("bizType",2001);
+                c.createCriteria().andIn("bizType", CollUtil.newArrayList(BizTypeEnum.OPEN_GROUP_PAY.getKey(),BizTypeEnum.JOIN_GROUP_PAY.getKey()));
                 Integer payNum = flowService.countByCondition(c);
                 bo.setSuccessGroupNum(payNum);
-
+                //钱包余额
+                Account wallet = accountService.getAccount(u.getId(), 1);
+                bo.setWalletBalance(wallet.getBalance());
+                Account earnings = accountService.getAccount(u.getId(), 2);
+                bo.setEarningsBalance(earnings.getBalance());
                 return bo;
             }).collect(Collectors.toList()));
         } catch (Exception e) {
@@ -112,5 +120,12 @@ public class UserController extends AbstractApiController {
         return ResultGenerator.genSuccessResult(pageInfo);
     }
 
+    @GetMapping("/detail")
+    @ApiOperation(value = "获取用户详情",httpMethod = "GET")
+    public Result<List<UserBo2>> list(@RequestParam Long userId) {
+
+        return ResultGenerator.genSuccessResult();
+    }
+
 
 }