优化

cif-api/src/main/java/com/txz/cif/dto/ConfigMemberDTO.java

@@ -0,0 +1,143 @@
+/*
+*
+* ConfigMemberDTO.java
+* Copyright(C) 2017-2020 fendo公司
+* @date 2025-07-15
+*/
+package com.txz.cif.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+public class ConfigMemberDTO implements Serializable {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 会员等级
+     */
+    private Integer level;
+
+    /**
+     * 邀请人数
+     */
+    private Integer invitedNo;
+
+    /**
+     * 一级佣金
+     */
+    private BigDecimal directReferralReward;
+
+    /**
+     * 二级佣金
+     */
+    private BigDecimal indirectReferralReward;
+
+    /**
+     * 可参团数量
+     */
+    private Integer joinedGroupsNo;
+
+    /**
+     * c_config_member
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 会员等级
+     * @return level 会员等级
+     */
+    public Integer getLevel() {
+        return level;
+    }
+
+    /**
+     * 会员等级
+     * @param level 会员等级
+     */
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    /**
+     * 邀请人数
+     * @return invited_no 邀请人数
+     */
+    public Integer getInvitedNo() {
+        return invitedNo;
+    }
+
+    /**
+     * 邀请人数
+     * @param invitedNo 邀请人数
+     */
+    public void setInvitedNo(Integer invitedNo) {
+        this.invitedNo = invitedNo;
+    }
+
+    /**
+     * 一级佣金
+     * @return direct_referral_reward 一级佣金
+     */
+    public BigDecimal getDirectReferralReward() {
+        return directReferralReward;
+    }
+
+    /**
+     * 一级佣金
+     * @param directReferralReward 一级佣金
+     */
+    public void setDirectReferralReward(BigDecimal directReferralReward) {
+        this.directReferralReward = directReferralReward;
+    }
+
+    /**
+     * 二级佣金
+     * @return Indirect_referral_reward 二级佣金
+     */
+    public BigDecimal getIndirectReferralReward() {
+        return indirectReferralReward;
+    }
+
+    /**
+     * 二级佣金
+     * @param indirectReferralReward 二级佣金
+     */
+    public void setIndirectReferralReward(BigDecimal indirectReferralReward) {
+        this.indirectReferralReward = indirectReferralReward;
+    }
+
+    /**
+     * 可参团数量
+     * @return joined_groups_no 可参团数量
+     */
+    public Integer getJoinedGroupsNo() {
+        return joinedGroupsNo;
+    }
+
+    /**
+     * 可参团数量
+     * @param joinedGroupsNo 可参团数量
+     */
+    public void setJoinedGroupsNo(Integer joinedGroupsNo) {
+        this.joinedGroupsNo = joinedGroupsNo;
+    }
+}

cif-api/src/main/java/com/txz/cif/dto/RechargeRecordDTO.java

@@ -0,0 +1,375 @@
+/*
+*
+* RechargeRecordDTO.java
+* Copyright(C) 2017-2020 fendo公司
+* @date 2025-07-15
+*/
+package com.txz.cif.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class RechargeRecordDTO implements Serializable {
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 交易金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 状态 1处理中 2充值成功 3充值失败 4超时取消
+     */
+    private Integer status;
+
+    /**
+     * 渠道
+     */
+    private String channel;
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    private String userPhone;
+
+    /**
+     * 交易时间
+     */
+    private Date transTime;
+
+    /**
+     * 交易成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 商品id
+     */
+    private Integer goodsId;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * c_recharge_record
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 订单号
+     * @return order_no 订单号
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * 订单号
+     * @param orderNo 订单号
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * 用户id
+     * @return user_id 用户id
+     */
+    public Long getUserId() {
+        return userId;
+    }
+
+    /**
+     * 用户id
+     * @param userId 用户id
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 交易金额
+     * @return amount 交易金额
+     */
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    /**
+     * 交易金额
+     * @param amount 交易金额
+     */
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * 状态 1处理中 2充值成功 3充值失败 4超时取消
+     * @return status 状态 1处理中 2充值成功 3充值失败 4超时取消
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 状态 1处理中 2充值成功 3充值失败 4超时取消
+     * @param status 状态 1处理中 2充值成功 3充值失败 4超时取消
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 渠道
+     * @return channel 渠道
+     */
+    public String getChannel() {
+        return channel;
+    }
+
+    /**
+     * 渠道
+     * @param channel 渠道
+     */
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    /**
+     * 币种
+     * @return currency 币种
+     */
+    public String getCurrency() {
+        return currency;
+    }
+
+    /**
+     * 币种
+     * @param currency 币种
+     */
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    /**
+     * 用户名
+     * @return user_name 用户名
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * 用户名
+     * @param userName 用户名
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 手机号
+     * @return user_phone 手机号
+     */
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    /**
+     * 手机号
+     * @param userPhone 手机号
+     */
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    /**
+     * 交易时间
+     * @return trans_time 交易时间
+     */
+    public Date getTransTime() {
+        return transTime;
+    }
+
+    /**
+     * 交易时间
+     * @param transTime 交易时间
+     */
+    public void setTransTime(Date transTime) {
+        this.transTime = transTime;
+    }
+
+    /**
+     * 交易成功时间
+     * @return success_time 交易成功时间
+     */
+    public Date getSuccessTime() {
+        return successTime;
+    }
+
+    /**
+     * 交易成功时间
+     * @param successTime 交易成功时间
+     */
+    public void setSuccessTime(Date successTime) {
+        this.successTime = successTime;
+    }
+
+    /**
+     * 商品id
+     * @return goods_id 商品id
+     */
+    public Integer getGoodsId() {
+        return goodsId;
+    }
+
+    /**
+     * 商品id
+     * @param goodsId 商品id
+     */
+    public void setGoodsId(Integer goodsId) {
+        this.goodsId = goodsId;
+    }
+
+    /**
+     * 创建人
+     * @return create_user 创建人
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * 创建人
+     * @param createUser 创建人
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * 更新人
+     * @return update_user 更新人
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * 更新人
+     * @param updateUser 更新人
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * 更新时间
+     * @return update_time 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 版本号
+     * @return version 版本号
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 版本号
+     * @param version 版本号
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+}

cif-api/src/main/java/com/txz/cif/dto/User2DTO.java

@@ -0,0 +1,521 @@
+/*
+*
+* User2DTO.java
+* Copyright(C) 2017-2020 fendo公司
+* @date 2025-07-14
+*/
+package com.txz.cif.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class User2DTO implements Serializable {
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * pid
+     */
+    private Long pid;
+
+    /**
+     * 爷爷id
+     */
+    private Long ppid;
+
+    /**
+     * 用户号
+     */
+    private String userId;
+
+    /**
+     * 邀请码
+     */
+    private String invitedCode;
+
+    /**
+     * 昵称
+     */
+    private String nickname;
+
+    /**
+     * 身份证号
+     */
+    private String identity;
+
+    /**
+     * 头像
+     */
+    private String headPic;
+
+    /**
+     * 性别 0未知 1男 2女
+     */
+    private Byte sex;
+
+    /**
+     * 状态  1正常 2禁用 3停用 4锁定
+     */
+    private Byte status;
+
+    /**
+     * 银行
+     */
+    private String bank;
+
+    /**
+     * 名字
+     */
+    private String name;
+
+    /**
+     * 电话
+     */
+    private String phoneNo;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * vip等级
+     */
+    private Integer vipLevel;
+
+    /**
+     * 最后登录时间
+     */
+    private Date lastLoginTime;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * 删除状态 1未删除 2已删除
+     */
+    private Byte isDelete;
+
+    /**
+     * 密码
+     */
+    private String pwd;
+
+    /**
+     * 盐
+     */
+    private String salt;
+
+    /**
+     * c_user2
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * pid
+     * @return pid pid
+     */
+    public Long getPid() {
+        return pid;
+    }
+
+    /**
+     * pid
+     * @param pid pid
+     */
+    public void setPid(Long pid) {
+        this.pid = pid;
+    }
+
+    /**
+     * 爷爷id
+     * @return ppid 爷爷id
+     */
+    public Long getPpid() {
+        return ppid;
+    }
+
+    /**
+     * 爷爷id
+     * @param ppid 爷爷id
+     */
+    public void setPpid(Long ppid) {
+        this.ppid = ppid;
+    }
+
+    /**
+     * 用户号
+     * @return user_id 用户号
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * 用户号
+     * @param userId 用户号
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 邀请码
+     * @return invited_code 邀请码
+     */
+    public String getInvitedCode() {
+        return invitedCode;
+    }
+
+    /**
+     * 邀请码
+     * @param invitedCode 邀请码
+     */
+    public void setInvitedCode(String invitedCode) {
+        this.invitedCode = invitedCode;
+    }
+
+    /**
+     * 昵称
+     * @return nickname 昵称
+     */
+    public String getNickname() {
+        return nickname;
+    }
+
+    /**
+     * 昵称
+     * @param nickname 昵称
+     */
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    /**
+     * 身份证号
+     * @return identity 身份证号
+     */
+    public String getIdentity() {
+        return identity;
+    }
+
+    /**
+     * 身份证号
+     * @param identity 身份证号
+     */
+    public void setIdentity(String identity) {
+        this.identity = identity;
+    }
+
+    /**
+     * 头像
+     * @return head_pic 头像
+     */
+    public String getHeadPic() {
+        return headPic;
+    }
+
+    /**
+     * 头像
+     * @param headPic 头像
+     */
+    public void setHeadPic(String headPic) {
+        this.headPic = headPic;
+    }
+
+    /**
+     * 性别 0未知 1男 2女
+     * @return sex 性别 0未知 1男 2女
+     */
+    public Byte getSex() {
+        return sex;
+    }
+
+    /**
+     * 性别 0未知 1男 2女
+     * @param sex 性别 0未知 1男 2女
+     */
+    public void setSex(Byte sex) {
+        this.sex = sex;
+    }
+
+    /**
+     * 状态  1正常 2禁用 3停用 4锁定
+     * @return status 状态  1正常 2禁用 3停用 4锁定
+     */
+    public Byte getStatus() {
+        return status;
+    }
+
+    /**
+     * 状态  1正常 2禁用 3停用 4锁定
+     * @param status 状态  1正常 2禁用 3停用 4锁定
+     */
+    public void setStatus(Byte status) {
+        this.status = status;
+    }
+
+    /**
+     * 银行
+     * @return bank 银行
+     */
+    public String getBank() {
+        return bank;
+    }
+
+    /**
+     * 银行
+     * @param bank 银行
+     */
+    public void setBank(String bank) {
+        this.bank = bank;
+    }
+
+    /**
+     * 名字
+     * @return name 名字
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 名字
+     * @param name 名字
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * 电话
+     * @return phone_no 电话
+     */
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    /**
+     * 电话
+     * @param phoneNo 电话
+     */
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    /**
+     * 银行账号
+     * @return bank_account 银行账号
+     */
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    /**
+     * 银行账号
+     * @param bankAccount 银行账号
+     */
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    /**
+     * vip等级
+     * @return vip_level vip等级
+     */
+    public Integer getVipLevel() {
+        return vipLevel;
+    }
+
+    /**
+     * vip等级
+     * @param vipLevel vip等级
+     */
+    public void setVipLevel(Integer vipLevel) {
+        this.vipLevel = vipLevel;
+    }
+
+    /**
+     * 最后登录时间
+     * @return last_login_time 最后登录时间
+     */
+    public Date getLastLoginTime() {
+        return lastLoginTime;
+    }
+
+    /**
+     * 最后登录时间
+     * @param lastLoginTime 最后登录时间
+     */
+    public void setLastLoginTime(Date lastLoginTime) {
+        this.lastLoginTime = lastLoginTime;
+    }
+
+    /**
+     * 创建人
+     * @return create_user 创建人
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * 创建人
+     * @param createUser 创建人
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * 更新人
+     * @return update_user 更新人
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * 更新人
+     * @param updateUser 更新人
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * 更新时间
+     * @return update_time 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 版本号
+     * @return version 版本号
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 版本号
+     * @param version 版本号
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    /**
+     * 删除状态 1未删除 2已删除
+     * @return is_delete 删除状态 1未删除 2已删除
+     */
+    public Byte getIsDelete() {
+        return isDelete;
+    }
+
+    /**
+     * 删除状态 1未删除 2已删除
+     * @param isDelete 删除状态 1未删除 2已删除
+     */
+    public void setIsDelete(Byte isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    /**
+     * 密码
+     * @return pwd 密码
+     */
+    public String getPwd() {
+        return pwd;
+    }
+
+    /**
+     * 密码
+     * @param pwd 密码
+     */
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    /**
+     * 盐
+     * @return salt 盐
+     */
+    public String getSalt() {
+        return salt;
+    }
+
+    /**
+     * 盐
+     * @param salt 盐
+     */
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+}

cif-api/src/main/java/com/txz/cif/dto/WithdrawRecordDTO.java

@@ -0,0 +1,375 @@
+/*
+*
+* WithdrawRecordDTO.java
+* Copyright(C) 2017-2020 fendo公司
+* @date 2025-07-15
+*/
+package com.txz.cif.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class WithdrawRecordDTO implements Serializable {
+    /**
+     * 
+     */
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 交易金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 手续费
+     */
+    private BigDecimal fee;
+
+    /**
+     * 状态 1处理中 2提现成功 3提现失败 4超时取消
+     */
+    private Integer status;
+
+    /**
+     * 渠道
+     */
+    private String channel;
+
+    /**
+     * 币种
+     */
+    private String currency;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    private String userPhone;
+
+    /**
+     * 交易时间
+     */
+    private Date transTime;
+
+    /**
+     * 交易成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 创建人
+     */
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * c_withdraw_record
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     * @return id 
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * 
+     * @param id 
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 订单号
+     * @return order_no 订单号
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * 订单号
+     * @param orderNo 订单号
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * 用户id
+     * @return user_id 用户id
+     */
+    public Long getUserId() {
+        return userId;
+    }
+
+    /**
+     * 用户id
+     * @param userId 用户id
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 交易金额
+     * @return amount 交易金额
+     */
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    /**
+     * 交易金额
+     * @param amount 交易金额
+     */
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * 手续费
+     * @return fee 手续费
+     */
+    public BigDecimal getFee() {
+        return fee;
+    }
+
+    /**
+     * 手续费
+     * @param fee 手续费
+     */
+    public void setFee(BigDecimal fee) {
+        this.fee = fee;
+    }
+
+    /**
+     * 状态 1处理中 2提现成功 3提现失败 4超时取消
+     * @return status 状态 1处理中 2提现成功 3提现失败 4超时取消
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 状态 1处理中 2提现成功 3提现失败 4超时取消
+     * @param status 状态 1处理中 2提现成功 3提现失败 4超时取消
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 渠道
+     * @return channel 渠道
+     */
+    public String getChannel() {
+        return channel;
+    }
+
+    /**
+     * 渠道
+     * @param channel 渠道
+     */
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    /**
+     * 币种
+     * @return currency 币种
+     */
+    public String getCurrency() {
+        return currency;
+    }
+
+    /**
+     * 币种
+     * @param currency 币种
+     */
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    /**
+     * 用户名
+     * @return user_name 用户名
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * 用户名
+     * @param userName 用户名
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 手机号
+     * @return user_phone 手机号
+     */
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    /**
+     * 手机号
+     * @param userPhone 手机号
+     */
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    /**
+     * 交易时间
+     * @return trans_time 交易时间
+     */
+    public Date getTransTime() {
+        return transTime;
+    }
+
+    /**
+     * 交易时间
+     * @param transTime 交易时间
+     */
+    public void setTransTime(Date transTime) {
+        this.transTime = transTime;
+    }
+
+    /**
+     * 交易成功时间
+     * @return success_time 交易成功时间
+     */
+    public Date getSuccessTime() {
+        return successTime;
+    }
+
+    /**
+     * 交易成功时间
+     * @param successTime 交易成功时间
+     */
+    public void setSuccessTime(Date successTime) {
+        this.successTime = successTime;
+    }
+
+    /**
+     * 创建人
+     * @return create_user 创建人
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * 创建人
+     * @param createUser 创建人
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * 更新人
+     * @return update_user 更新人
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * 更新人
+     * @param updateUser 更新人
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * 更新时间
+     * @return update_time 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 更新时间
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 创建时间
+     * @return create_time 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 创建时间
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 版本号
+     * @return version 版本号
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 版本号
+     * @param version 版本号
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+}

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

@@ -43,7 +43,7 @@ public class RechargeParam implements Serializable {
     private BigDecimal amount;
 
     /**
-     * 业务类型 1001充值 2001平台收费 2002专家佣金 2003销售佣金 3001提现 4001诊断冻结 5001诊断解冻
+     * 业务类型 1001充值 2001平台收费 3001提现 4001冻结 5001解冻
      */
     private Integer bizType;
 

cif-api/src/main/java/com/txz/cif/service/AccountDubboService.java

@@ -10,15 +10,7 @@ import java.math.BigDecimal;
 public interface AccountDubboService {
 
 
-    AccountDTO getAccount(Long userId);
 
-    /**
-     *  检查金额
-     * @param userId
-     * @param amount
-     * @return true 足够  false  不足
-     */
-    Boolean checkFee(Long userId, BigDecimal amount);
 
     /**
      * 冻结

cif-api/src/main/java/com/txz/cif/service/SettleDubboService.java

@@ -1,26 +0,0 @@
-package com.txz.cif.service;
-
-
-import com.txz.cif.dto.SettleDTO;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * 结算
- */
-public interface SettleDubboService {
-
-    /**
-     * 获取方案金额
-     * @param planId
-     * @param size
-     * @param sysType
-     * @return
-     */
-    BigDecimal getAmount(Long planId, Integer size, Integer sysType, Integer bizType);
-
-
-    List<SettleDTO> settleList( Long orgId , Long userId, String year , String orderby);
-
-}

cif-api/src/main/java/com/txz/cif/service/UserDubboService.java

@@ -15,13 +15,6 @@ public interface UserDubboService {
 
     UserDTO getUser(Long userId);
 
-//    OrgDTO getOrgByUserId(Long userId);
-
-//    HospitalDTO getHospitalByUserId(Long userId);
-
-//    HospitalDTO getHospitalById(Long hospitalId);
-
     void updateLastTime(Long userId);
 
-//    boolean sendMsg(MessageParam param);
 }

cif-service/src/main/java/com/txz/cif/core/AbstractApiController.java

@@ -11,7 +11,6 @@ public abstract class AbstractApiController {
      */
     public static final String X_CLIENT_TOKEN_USERID = "x-client-token-userId";
     public static final String X_CLIENT_TOKEN_OPERATORID = "x-client-token-operatorId";
-    public static final String APP_CODE = "appCode";
 
 
 }

cif-service/src/main/java/com/txz/cif/core/AuthService.java

@@ -2,6 +2,7 @@ package com.txz.cif.core;
 
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONUtil;
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.Jwts;
@@ -12,6 +13,8 @@ import org.apache.commons.lang3.tuple.ImmutableTriple;
 import org.apache.commons.lang3.tuple.Triple;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
@@ -27,16 +30,15 @@ public class AuthService {
      * jwt token 密钥，主要用于token解析，签名验证
      */
     @Value("${spring.security.oauth2.jwt.signingKey}")
-    private static String signingKey = "123456";
+    private static String signingKey = "txz123456";
 
 
-    public String buildJwtToken(Long operatorId, Long userId) {
-        String KEY = "123456";
+    public String buildJwtToken( Long userId) {
+        String KEY = "txz123456";
         Date now = DateUtil.date();
         Date exp = DateUtil.offset(now, DateField.DAY_OF_YEAR,30);
         Map<String, Object> claims = new HashMap<String, Object>();
         claims.put("userId", userId);
-        claims.put("operatorId", operatorId);
 
         String jwtToken = Jwts.builder()
                 .setClaims(claims)
@@ -49,13 +51,12 @@ public class AuthService {
         return "Bearer " +jwtToken;
     }
 
-    public String buildJwtTokenWithRole(Long operatorId, Long userId,Integer role, Integer day) {
+    public String buildJwtTokenWithRole( Long userId,Integer role, Integer day) {
         String KEY = "123456";
         Date now = DateUtil.date();
         Date exp = DateUtil.offset(now, DateField.DAY_OF_YEAR,day);
         Map<String, Object> claims = new HashMap<String, Object>();
         claims.put("userId", userId);
-        claims.put("operatorId", operatorId);
         claims.put("role", role);
 
         String jwtToken = Jwts.builder()
@@ -99,6 +100,20 @@ public class AuthService {
         return claims;
     }
 
+    public Long getTokenUserId(HttpServletRequest request) {
+        if (request == null){
+            ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (null != sra) {
+                request = sra.getRequest();
+            } else {
+                return null;
+            }
+        }
+        String token = request.getHeader("token");
+        Claims claims = getJwt(token);
+        return Long.valueOf(claims.get("userId").toString());
+    }
+
 }
 
 

cif-service/src/main/java/com/txz/cif/dao/AccountFlowMapper.java

@@ -10,30 +10,5 @@ import java.util.Map;
 
 public interface AccountFlowMapper extends Mapper<AccountFlow> {
 
-    /**
-     * 查询医院端支出
-     * 获取时间范围内的交易总金额
-     * @param map
-     * @return
-     */
-    List<IndexCollectBO> sumAmount(Map<String, Object> map);
 
-    /**
-     * 获取时间范围内的业务id个数
-     * @param map
-     * @return
-     */
-    IndexCollectBO countBizId(Map<String, Object> map);
-
-    /**
-     * 查询某个科目下时间段的出入流水总金额
-     * @param aliases 获取别名（101）
-     * @param type 类型 1出金 2入金
-     * @param startTime 开始时间 2022-10-01 00:00:00 包含
-     * @param endTime 结束时间 2022-10-02 00:00:00 不包含
-     * @return
-     */
-    BigDecimal sumOccur(Map<String, Object> map);
-
-    BigDecimal sumYearExpenditureAmount(Long accountId);
 }

cif-service/src/main/java/com/txz/cif/dao/ApplicationMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.Application;
-
-public interface ApplicationMapper extends Mapper<Application> {
-}

cif-service/src/main/java/com/txz/cif/dao/BannerMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.Banner;
-
-public interface BannerMapper extends Mapper<Banner> {
-}

cif-service/src/main/java/com/txz/cif/dao/ConfigMemberMapper.java

@@ -0,0 +1,7 @@
+package com.txz.cif.dao;
+
+import com.txz.cif.core.Mapper;
+import com.txz.cif.model.ConfigMember;
+
+public interface ConfigMemberMapper extends Mapper<ConfigMember> {
+}

cif-service/src/main/java/com/txz/cif/dao/MenuMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.Menu;
-
-public interface MenuMapper extends Mapper<Menu> {
-}

cif-service/src/main/java/com/txz/cif/dao/OperatorMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.Operator;
-
-public interface OperatorMapper extends Mapper<Operator> {
-}

cif-service/src/main/java/com/txz/cif/dao/OrderMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.Order;
-
-public interface OrderMapper extends Mapper<Order> {
-}

cif-service/src/main/java/com/txz/cif/dao/RechargeRecordMapper.java

@@ -0,0 +1,7 @@
+package com.txz.cif.dao;
+
+import com.txz.cif.core.Mapper;
+import com.txz.cif.model.RechargeRecord;
+
+public interface RechargeRecordMapper extends Mapper<RechargeRecord> {
+}

cif-service/src/main/java/com/txz/cif/dao/SettleInventoryMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.SettleInventory;
-
-public interface SettleInventoryMapper extends Mapper<SettleInventory> {
-}

cif-service/src/main/java/com/txz/cif/dao/SettleMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.Settle;
-
-public interface SettleMapper extends Mapper<Settle> {
-}

cif-service/src/main/java/com/txz/cif/dao/SettlePlanMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.SettlePlan;
-
-public interface SettlePlanMapper extends Mapper<SettlePlan> {
-}

cif-service/src/main/java/com/txz/cif/dao/SysMessageMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.SysMessage;
-
-public interface SysMessageMapper extends Mapper<SysMessage> {
-}

cif-service/src/main/java/com/txz/cif/dao/SysMessageTemplateMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.SysMessageTemplate;
-
-public interface SysMessageTemplateMapper extends Mapper<SysMessageTemplate> {
-}

cif-service/src/main/java/com/txz/cif/dao/UserLogMapper.java

@@ -1,7 +0,0 @@
-package com.txz.cif.dao;
-
-import com.txz.cif.core.Mapper;
-import com.txz.cif.model.UserLog;
-
-public interface UserLogMapper extends Mapper<UserLog> {
-}

cif-service/src/main/java/com/txz/cif/dao/WithdrawRecordMapper.java

@@ -0,0 +1,7 @@
+package com.txz.cif.dao;
+
+import com.txz.cif.core.Mapper;
+import com.txz.cif.model.WithdrawRecord;
+
+public interface WithdrawRecordMapper extends Mapper<WithdrawRecord> {
+}

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

@@ -30,34 +30,34 @@ public class AccountDubboServiceImpl implements AccountDubboService {
     @Resource
     private UserService userService;
 
-    @Override
-    public AccountDTO getAccount(Long userId) {
-        User user = userService.findById(userId);
-        if (user == null){
-            return null;
-        }
-        Account account = accountService.findById( user.getAccountId());
-        if (account == null){
-            return null;
-        }
-        return BeanUtil.toBean(account,AccountDTO.class);
-    }
+//    @Override
+//    public AccountDTO getAccount(Long userId) {
+//        User user = userService.findById(userId);
+//        if (user == null){
+//            return null;
+//        }
+//        Account account = accountService.findById( user.getAccountId());
+//        if (account == null){
+//            return null;
+//        }
+//        return BeanUtil.toBean(account,AccountDTO.class);
+//    }
 
-    @Override
-    public Boolean checkFee(Long userId, BigDecimal amount) {
-        User user = userService.findById(userId);
-        if (user == null){
-            return false;
-        }
-        Account account = accountService.findById( user.getAccountId());
-        if (account == null){
-            return false;
-        }
-        if (account.getBalance().subtract(account.getFreezeAmount()).subtract(amount).compareTo(BigDecimal.ZERO) <0){
-            return false;
-        }
-        return true;
-    }
+//    @Override
+//    public Boolean checkFee(Long userId, BigDecimal amount) {
+//        User user = userService.findById(userId);
+//        if (user == null){
+//            return false;
+//        }
+//        Account account = accountService.findById( user.getAccountId());
+//        if (account == null){
+//            return false;
+//        }
+//        if (account.getBalance().subtract(account.getFreezeAmount()).subtract(amount).compareTo(BigDecimal.ZERO) <0){
+//            return false;
+//        }
+//        return true;
+//    }
 
     @Override
     public Result freeze(FreezdParam param) {

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

@@ -1,77 +0,0 @@
-package com.txz.cif.dubbo.impl;
-
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.txz.cif.core.ResultCode;
-import com.txz.cif.core.ServiceException;
-import com.txz.cif.dto.SettleDTO;
-import com.txz.cif.model.Settle;
-import com.txz.cif.model.SettleInventory;
-import com.txz.cif.service.*;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.dubbo.config.annotation.Service;
-import tk.mybatis.mapper.entity.Condition;
-import tk.mybatis.mapper.entity.Example;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Service
-public class SettleDubboServiceImpl implements SettleDubboService {
-
-    @Resource
-    private SettleInventoryService settleInventoryService;
-
-    @Resource
-    private SettleService settleService;
-
-
-    @Override
-    public BigDecimal getAmount(Long planId, Integer size, Integer sysType,
-                                          Integer bizType) {
-        Condition c = new Condition(SettleInventory.class);
-        c.createCriteria().andEqualTo("planId",planId).andEqualTo("sysType",sysType)
-                .andEqualTo("bizType",bizType)
-                .andLessThanOrEqualTo("startSize",size)
-                .andGreaterThanOrEqualTo("endSize",size);
-        List<SettleInventory> inventories = settleInventoryService.findByCondition(c);
-        if (CollUtil.isEmpty(inventories)){
-            return null;
-        }
-        return inventories.get(0).getAmount();
-    }
-
-
-
-    @Override
-    public List<SettleDTO> settleList(Long orgId, Long userId, String year, String orderby) {
-
-        Condition condition = new Condition(Settle.class);
-        Example.Criteria criteria = condition.createCriteria();
-        if (orgId!= null){
-            criteria.andEqualTo("orgId", orgId);
-        }
-        if (userId!= null){
-            criteria.andEqualTo("userId", userId);
-        }
-        if (StrUtil.isNotBlank(year)){
-            criteria.andGreaterThanOrEqualTo("month",year+"-01-01 00:00:00");
-            criteria.andLessThanOrEqualTo("month",year+"-12-31 23:59:59");
-        }
-        if (StrUtil.isNotBlank(orderby)){
-            condition.setOrderByClause(orderby);
-        }
-        List<Settle> list = settleService.findByCondition(condition);
-        if (CollUtil.isEmpty(list)){
-            return null;
-        }
-        return list.stream().map(temp -> BeanUtil.toBean(temp,SettleDTO.class)).collect(Collectors.toList());
-    }
-}

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

@@ -25,11 +25,6 @@ public class UserDubboServiceImpl implements UserDubboService {
     @Resource
     private UserService userService;
 
-//    @Resource
-//    private OrgService orgService;
-//
-//    @Resource
-//    private HospitalService hospitalService;
 
 
     @Override
@@ -55,50 +50,17 @@ public class UserDubboServiceImpl implements UserDubboService {
             return null;
         }
         UserDTO userDTO =  BeanUtil.toBean(user,UserDTO.class);
-        userDTO.setHeadPic(user.getIcon());
+        userDTO.setHeadPic(user.getHeadPic());
         return userDTO;
     }
 
-//    @Override
-//    public OrgDTO getOrgByUserId(Long userId) {
-//        Org org = orgService.findBy("userId",userId);
-//        if (org == null){
-//            return null;
-//        }
-//        return BeanUtil.toBean(org,OrgDTO.class);
-//    }
-//
-//    @Override
-//    public HospitalDTO getHospitalByUserId(Long userId) {
-//        Hospital hospital = hospitalService.findBy("userId",userId);
-//        if (hospital == null){
-//            return null;
-//        }
-//        return BeanUtil.toBean(hospital,HospitalDTO.class);
-//    }
-//
-//    @Override
-//    public HospitalDTO getHospitalById(Long hospitalId) {
-//        Hospital hospital = hospitalService.findById(hospitalId);
-//        if (hospital == null){
-//            return null;
-//        }
-//        return BeanUtil.toBean(hospital,HospitalDTO.class);
-//    }
-//
     @Override
     public void updateLastTime(Long userId) {
         User user = userService.findById(userId);
         if (user == null){
             return ;
         }
-        userService.update(User.builder().id(userId).lastTime(DateUtil.date()).build());
+        userService.update(User.builder().id(userId).lastLoginTime(DateUtil.date()).build());
     }
-//
-//    @Override
-//    public boolean sendMsg(MessageParam param) {
-//        log.error("[发生消息]入参"+ JSONUtil.toJsonStr(param));
-//        return userService.sendMsg(param);
-//    }
 
 }

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

@@ -22,6 +22,10 @@ public class Account {
     @ApiModelProperty(value="id")
     private Long id;
 
+    @Column(name = "user_id")
+    @ApiModelProperty(value="用户id")
+    private Long userId;
+
     /**
      * 备注
      */
@@ -97,6 +101,10 @@ public class Account {
     @ApiModelProperty(value="updateTime更新时间")
     private Date updateTime;
 
+
+    @ApiModelProperty(value="版本号")
+    private String version;
+
     /**
      * 获取有效余额
      */

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

@@ -1,106 +0,0 @@
-package com.txz.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@ApiModel(value="Application")
-@Table(name = "c_application")
-public class Application implements Serializable {
-    private static final long serialVersionUID = -8366251540859700051L;
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Integer id;
-
-    /**
-     * 名称
-     */
-    @ApiModelProperty(value="name名称")
-    private String name;
-
-    @ApiModelProperty(value="类型 1梦想庄园 2救救金鱼 3疯狂原始人 4梦想庄园pad版 5大圣历险")
-    private Integer type;
-
-    /**
-     * 所属应用编码 编码(规范 以手表应用为基础，公众号和服务号+“_”)
-     */
-    @Column(name = "app_code")
-    @ApiModelProperty(value="appCode所属应用编码 编码(规范 以手表应用为基础，公众号和服务号+“_”)")
-    private String appCode;
-
-    /**
-     * 版本号
-     */
-    @ApiModelProperty(value="version版本号")
-    private String version;
-
-    /**
-     * 安装包下载地址
-     */
-    @Column(name = "down_url")
-    @ApiModelProperty(value="downUrl安装包下载地址")
-    private String downUrl;
-
-    /**
-     * 状态 1启用 2禁用
-     */
-    @ApiModelProperty(value="status状态 1启用 2禁用")
-    private Integer status;
-
-    /**
-     * 第三方appid
-     */
-    @Column(name = "out_app_id")
-    @ApiModelProperty(value="outAppId第三方appid")
-    private String outAppId;
-
-    /**
-     * 第三方app密钥
-     */
-    @Column(name = "out_app_secret")
-    @ApiModelProperty(value="outAppSecret第三方app密钥")
-    private String outAppSecret;
-
-    /**
-     * 第三方根地址
-     */
-    @Column(name = "out_base_url")
-    @ApiModelProperty(value="outBaseUrl第三方根地址")
-    private String outBaseUrl;
-
-    /**
-     * 二维码地址
-     */
-    @Column(name = "out_qr_code")
-    @ApiModelProperty(value="outQrCode二维码地址")
-    private String outQrCode;
-
-    /**
-     * 第三方类型 1应用 2公众号 3服务号
-     */
-    @Column(name = "out_type")
-    @ApiModelProperty(value="outType第三方类型 1应用 2公众号 3服务号")
-    private Integer outType;
-
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime")
-    private Date createTime;
-
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime")
-    private Date updateTime;
-
-
-}

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

@@ -1,325 +0,0 @@
-package com.txz.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import javax.persistence.*;
-
-@ApiModel(value="com.medipath.cif.model.Banner")
-@Table(name = "c_banner")
-public class Banner {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Integer id;
-
-    /**
-     * 应用编号
-     */
-    @Column(name = "app_code")
-    @ApiModelProperty(value="appCode应用编号")
-    private String appCode;
-
-    /**
-     * 名称
-     */
-    @ApiModelProperty(value="name名称")
-    private String name;
-
-    /**
-     * 地址
-     */
-    @ApiModelProperty(value="url地址")
-    private String url;
-
-    /**
-     * 链接地址
-     */
-    @Column(name = "link_url")
-    @ApiModelProperty(value="linkUrl链接地址")
-    private String linkUrl;
-
-    /**
-     * 链接类型 1外链 2内链
-     */
-    @Column(name = "link_type")
-    @ApiModelProperty(value="linkType链接类型 1外链 2内链")
-    private Integer linkType;
-
-    /**
-     * 业务类型 1梦想庄园公众号banner
-     */
-    @Column(name = "biz_type")
-    @ApiModelProperty(value="bizType业务类型 1梦想庄园公众号banner")
-    private Integer bizType;
-
-    /**
-     * 状态 1正常 2禁用
-     */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
-    private Integer status;
-
-    /**
-     * 排序
-     */
-    @ApiModelProperty(value="seq排序")
-    private Integer seq;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
-    private Date updateTime;
-
-    /**
-     * 创建人
-     */
-    @Column(name = "create_name")
-    @ApiModelProperty(value="createName创建人")
-    private String createName;
-
-    /**
-     * 更新人
-     */
-    @Column(name = "update_name")
-    @ApiModelProperty(value="updateName更新人")
-    private String updateName;
-
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取应用编号
-     *
-     * @return app_code - 应用编号
-     */
-    public String getAppCode() {
-        return appCode;
-    }
-
-    /**
-     * 设置应用编号
-     *
-     * @param appCode 应用编号
-     */
-    public void setAppCode(String appCode) {
-        this.appCode = appCode;
-    }
-
-    /**
-     * 获取名称
-     *
-     * @return name - 名称
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置名称
-     *
-     * @param name 名称
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取地址
-     *
-     * @return url - 地址
-     */
-    public String getUrl() {
-        return url;
-    }
-
-    /**
-     * 设置地址
-     *
-     * @param url 地址
-     */
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    /**
-     * 获取链接地址
-     *
-     * @return link_url - 链接地址
-     */
-    public String getLinkUrl() {
-        return linkUrl;
-    }
-
-    /**
-     * 设置链接地址
-     *
-     * @param linkUrl 链接地址
-     */
-    public void setLinkUrl(String linkUrl) {
-        this.linkUrl = linkUrl;
-    }
-
-    /**
-     * 获取链接类型 1外链 2内链
-     *
-     * @return link_type - 链接类型 1外链 2内链
-     */
-    public Integer getLinkType() {
-        return linkType;
-    }
-
-    /**
-     * 设置链接类型 1外链 2内链
-     *
-     * @param linkType 链接类型 1外链 2内链
-     */
-    public void setLinkType(Integer linkType) {
-        this.linkType = linkType;
-    }
-
-    /**
-     * 获取业务类型 1梦想庄园公众号banner
-     *
-     * @return biz_type - 业务类型 1梦想庄园公众号banner
-     */
-    public Integer getBizType() {
-        return bizType;
-    }
-
-    /**
-     * 设置业务类型 1梦想庄园公众号banner
-     *
-     * @param bizType 业务类型 1梦想庄园公众号banner
-     */
-    public void setBizType(Integer bizType) {
-        this.bizType = bizType;
-    }
-
-    /**
-     * 获取状态 1正常 2禁用
-     *
-     * @return status - 状态 1正常 2禁用
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 1正常 2禁用
-     *
-     * @param status 状态 1正常 2禁用
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取排序
-     *
-     * @return seq - 排序
-     */
-    public Integer getSeq() {
-        return seq;
-    }
-
-    /**
-     * 设置排序
-     *
-     * @param seq 排序
-     */
-    public void setSeq(Integer seq) {
-        this.seq = seq;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取更新时间
-     *
-     * @return update_time - 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updateTime 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取创建人
-     *
-     * @return create_name - 创建人
-     */
-    public String getCreateName() {
-        return createName;
-    }
-
-    /**
-     * 设置创建人
-     *
-     * @param createName 创建人
-     */
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    /**
-     * 获取更新人
-     *
-     * @return update_name - 更新人
-     */
-    public String getUpdateName() {
-        return updateName;
-    }
-
-    /**
-     * 设置更新人
-     *
-     * @param updateName 更新人
-     */
-    public void setUpdateName(String updateName) {
-        this.updateName = updateName;
-    }
-}

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

@@ -0,0 +1,153 @@
+package com.txz.cif.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import javax.persistence.*;
+
+@ApiModel(value="com.txz.cif.model.ConfigMember")
+@Table(name = "c_config_member")
+public class ConfigMember {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value="id")
+    private Integer id;
+
+    /**
+     * 会员等级
+     */
+    @ApiModelProperty(value="level会员等级")
+    private Integer level;
+
+    /**
+     * 邀请人数
+     */
+    @Column(name = "invited_no")
+    @ApiModelProperty(value="invitedNo邀请人数")
+    private Integer invitedNo;
+
+    /**
+     * 一级佣金
+     */
+    @Column(name = "direct_referral_reward")
+    @ApiModelProperty(value="directReferralReward一级佣金")
+    private BigDecimal directReferralReward;
+
+    /**
+     * 二级佣金
+     */
+    @Column(name = "Indirect_referral_reward")
+    @ApiModelProperty(value="indirectReferralReward二级佣金")
+    private BigDecimal indirectReferralReward;
+
+    /**
+     * 可参团数量
+     */
+    @Column(name = "joined_groups_no")
+    @ApiModelProperty(value="joinedGroupsNo可参团数量")
+    private Integer joinedGroupsNo;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取会员等级
+     *
+     * @return level - 会员等级
+     */
+    public Integer getLevel() {
+        return level;
+    }
+
+    /**
+     * 设置会员等级
+     *
+     * @param level 会员等级
+     */
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    /**
+     * 获取邀请人数
+     *
+     * @return invited_no - 邀请人数
+     */
+    public Integer getInvitedNo() {
+        return invitedNo;
+    }
+
+    /**
+     * 设置邀请人数
+     *
+     * @param invitedNo 邀请人数
+     */
+    public void setInvitedNo(Integer invitedNo) {
+        this.invitedNo = invitedNo;
+    }
+
+    /**
+     * 获取一级佣金
+     *
+     * @return direct_referral_reward - 一级佣金
+     */
+    public BigDecimal getDirectReferralReward() {
+        return directReferralReward;
+    }
+
+    /**
+     * 设置一级佣金
+     *
+     * @param directReferralReward 一级佣金
+     */
+    public void setDirectReferralReward(BigDecimal directReferralReward) {
+        this.directReferralReward = directReferralReward;
+    }
+
+    /**
+     * 获取二级佣金
+     *
+     * @return Indirect_referral_reward - 二级佣金
+     */
+    public BigDecimal getIndirectReferralReward() {
+        return indirectReferralReward;
+    }
+
+    /**
+     * 设置二级佣金
+     *
+     * @param indirectReferralReward 二级佣金
+     */
+    public void setIndirectReferralReward(BigDecimal indirectReferralReward) {
+        this.indirectReferralReward = indirectReferralReward;
+    }
+
+    /**
+     * 获取可参团数量
+     *
+     * @return joined_groups_no - 可参团数量
+     */
+    public Integer getJoinedGroupsNo() {
+        return joinedGroupsNo;
+    }
+
+    /**
+     * 设置可参团数量
+     *
+     * @param joinedGroupsNo 可参团数量
+     */
+    public void setJoinedGroupsNo(Integer joinedGroupsNo) {
+        this.joinedGroupsNo = joinedGroupsNo;
+    }
+}

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

@@ -75,10 +75,10 @@ public class Flow {
     private BigDecimal amount;
 
     /**
-     * 业务类型 
+     * 业务类型 1充值 2提现 3参团 4退款 5开团红包 6参团红包 7签到红包 8下级红包佣金 9下下级红包佣金
      */
     @Column(name = "biz_type")
-    @ApiModelProperty(value="业务类型 1充值 2远程诊断 3提现 ")
+    @ApiModelProperty(value="类型 1充值 2提现 3参团 4退款 5开团红包 6参团红包 7签到红包 8下级红包佣金 9下下级红包佣金 ")
     private Integer bizType;
 
 

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

@@ -4,11 +4,19 @@ import cn.hutool.core.bean.BeanUtil;
 import com.txz.cif.web.bo.GoodsBO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 
-@ApiModel(value="com.medipath.cif.model.Goods")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+
+@ApiModel(value="com.txz.cif.model.Goods")
 @Table(name = "c_goods")
 public class Goods {
     @Id
@@ -34,8 +42,12 @@ public class Goods {
     @ApiModelProperty(value="pic小图")
     private String pic;
 
-    @ApiModelProperty(value="业务类型")
-    private Integer type;
+    @ApiModelProperty(value="折扣金额")
+    private BigDecimal discount;
+
+    @ApiModelProperty(value="折扣率")
+    private BigDecimal discountRate;
+
 
     /**
      * 大图
@@ -44,18 +56,7 @@ public class Goods {
     @ApiModelProperty(value="bigPic大图")
     private String bigPic;
 
-    /**
-     * 详情页地址列表 
-     */
-    @Column(name = "detail_pic")
-    @ApiModelProperty(value="detailPic详情页地址列表 ")
-    private String detailPic;
 
-    /**
-     * 备注
-     */
-    @ApiModelProperty(value="memo备注")
-    private String memo;
 
     /**
      * 状态 0未启用 1正常 2停用
@@ -69,12 +70,7 @@ public class Goods {
     @ApiModelProperty(value="amount定价")
     private BigDecimal amount;
 
-    /**
-     * 折扣价
-     */
-    @Column(name = "discount_amount")
-    @ApiModelProperty(value="discountAmount折扣价")
-    private BigDecimal discountAmount;
+
 
     @Column(name = "sort_num")
     @ApiModelProperty(value="sortNum")
@@ -88,231 +84,7 @@ public class Goods {
     @ApiModelProperty(value="updateTime")
     private Date updateTime;
 
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取商品名称
-     *
-     * @return name - 商品名称
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置商品名称
-     *
-     * @param name 商品名称
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取均价说明
-     *
-     * @return intro - 均价说明
-     */
-    public String getIntro() {
-        return intro;
-    }
 
-    /**
-     * 设置均价说明
-     *
-     * @param intro 均价说明
-     */
-    public void setIntro(String intro) {
-        this.intro = intro;
-    }
-
-    /**
-     * 获取小图
-     *
-     * @return pic - 小图
-     */
-    public String getPic() {
-        return pic;
-    }
-
-    /**
-     * 设置小图
-     *
-     * @param pic 小图
-     */
-    public void setPic(String pic) {
-        this.pic = pic;
-    }
-
-    /**
-     * 获取大图
-     *
-     * @return big_pic - 大图
-     */
-    public String getBigPic() {
-        return bigPic;
-    }
-
-    /**
-     * 设置大图
-     *
-     * @param bigPic 大图
-     */
-    public void setBigPic(String bigPic) {
-        this.bigPic = bigPic;
-    }
-
-    /**
-     * 获取详情页地址列表 
-     *
-     * @return detail_pic - 详情页地址列表 
-     */
-    public String getDetailPic() {
-        return detailPic;
-    }
-
-    /**
-     * 设置详情页地址列表 
-     *
-     * @param detailPic 详情页地址列表 
-     */
-    public void setDetailPic(String detailPic) {
-        this.detailPic = detailPic;
-    }
-
-    /**
-     * 获取备注
-     *
-     * @return memo - 备注
-     */
-    public String getMemo() {
-        return memo;
-    }
-
-    /**
-     * 设置备注
-     *
-     * @param memo 备注
-     */
-    public void setMemo(String memo) {
-        this.memo = memo;
-    }
-
-    /**
-     * 获取状态 0未启用 1正常 2停用
-     *
-     * @return status - 状态 0未启用 1正常 2停用
-     */
-    public Byte getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 0未启用 1正常 2停用
-     *
-     * @param status 状态 0未启用 1正常 2停用
-     */
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取定价
-     *
-     * @return amount - 定价
-     */
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    /**
-     * 设置定价
-     *
-     * @param amount 定价
-     */
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    /**
-     * 获取折扣价
-     *
-     * @return discount_amount - 折扣价
-     */
-    public BigDecimal getDiscountAmount() {
-        return discountAmount;
-    }
-
-    /**
-     * 设置折扣价
-     *
-     * @param discountAmount 折扣价
-     */
-    public void setDiscountAmount(BigDecimal discountAmount) {
-        this.discountAmount = discountAmount;
-    }
-
-    /**
-     * @return sort_num
-     */
-    public Integer getSortNum() {
-        return sortNum;
-    }
-
-    /**
-     * @param sortNum
-     */
-    public void setSortNum(Integer sortNum) {
-        this.sortNum = sortNum;
-    }
-
-    /**
-     * @return create_time
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * @param createTime
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return update_time
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * @param updateTime
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
 
     public GoodsBO generator() {
         GoodsBO bo = BeanUtil.toBean(this,GoodsBO.class);

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

@@ -1,450 +0,0 @@
-package com.txz.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import javax.persistence.*;
-
-@ApiModel(value="com.medipath.cif.model.Menu")
-@Table(name = "c_menu")
-public class Menu {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Integer id;
-
-    /**
-     * 应用编码
-     */
-    @Column(name = "app_code")
-    @ApiModelProperty(value="appCode应用编码")
-    private String appCode;
-
-    /**
-     * 来源类型 1应用编码 2组织id 3医院id
-     */
-    @Column(name = "source_type")
-    @ApiModelProperty(value="sourceType来源类型 1应用编码 2组织id 3医院id")
-    private Integer sourceType;
-
-    /**
-     * 来源id
-     */
-    @Column(name = "source_id")
-    @ApiModelProperty(value="sourceId来源id")
-    private Long sourceId;
-
-    /**
-     * 名称
-     */
-    @ApiModelProperty(value="name名称")
-    private String name;
-
-    /**
-     * 英文名
-     */
-    @Column(name = "e_name")
-    @ApiModelProperty(value="eName英文名")
-    private String eName;
-
-    /**
-     * logo图
-     */
-    @ApiModelProperty(value="logologo图")
-    private String logo;
-
-    /**
-     * 类型 1菜单2叶子菜单
-     */
-    @ApiModelProperty(value="type类型 1菜单2叶子菜单")
-    private String type;
-
-    /**
-     * 是否允许点击 1无子菜单 2有子菜单
-     */
-    @Column(name = "is_action")
-    @ApiModelProperty(value="isAction是否允许点击 1无子菜单 2有子菜单")
-    private String isAction;
-
-    /**
-     * 状态 1正常 2禁用
-     */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
-    private Integer status;
-
-    /**
-     * 跳转地址
-     */
-    @ApiModelProperty(value="url跳转地址")
-    private String url;
-
-    /**
-     * 前端排版
-     */
-    @Column(name = "composing_key")
-    @ApiModelProperty(value="composingKey前端排版")
-    private String composingKey;
-
-    /**
-     * 排序
-     */
-    @ApiModelProperty(value="seq排序")
-    private Integer seq;
-
-    /**
-     * 上级菜单
-     */
-    @Column(name = "parent_id")
-    @ApiModelProperty(value="parentId上级菜单")
-    private String parentId;
-
-    /**
-     * 创建人
-     */
-    @Column(name = "create_user_id")
-    @ApiModelProperty(value="createUserId创建人")
-    private String createUserId;
-
-    /**
-     * 更新人
-     */
-    @Column(name = "update_user_id")
-    @ApiModelProperty(value="updateUserId更新人")
-    private String updateUserId;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
-    private Date updateTime;
-
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取应用编码
-     *
-     * @return app_code - 应用编码
-     */
-    public String getAppCode() {
-        return appCode;
-    }
-
-    /**
-     * 设置应用编码
-     *
-     * @param appCode 应用编码
-     */
-    public void setAppCode(String appCode) {
-        this.appCode = appCode;
-    }
-
-    /**
-     * 获取来源类型 1应用编码 2组织id 3医院id
-     *
-     * @return source_type - 来源类型 1应用编码 2组织id 3医院id
-     */
-    public Integer getSourceType() {
-        return sourceType;
-    }
-
-    /**
-     * 设置来源类型 1应用编码 2组织id 3医院id
-     *
-     * @param sourceType 来源类型 1应用编码 2组织id 3医院id
-     */
-    public void setSourceType(Integer sourceType) {
-        this.sourceType = sourceType;
-    }
-
-    /**
-     * 获取来源id
-     *
-     * @return source_id - 来源id
-     */
-    public Long getSourceId() {
-        return sourceId;
-    }
-
-    /**
-     * 设置来源id
-     *
-     * @param sourceId 来源id
-     */
-    public void setSourceId(Long sourceId) {
-        this.sourceId = sourceId;
-    }
-
-    /**
-     * 获取名称
-     *
-     * @return name - 名称
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置名称
-     *
-     * @param name 名称
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取英文名
-     *
-     * @return e_name - 英文名
-     */
-    public String geteName() {
-        return eName;
-    }
-
-    /**
-     * 设置英文名
-     *
-     * @param eName 英文名
-     */
-    public void seteName(String eName) {
-        this.eName = eName;
-    }
-
-    /**
-     * 获取logo图
-     *
-     * @return logo - logo图
-     */
-    public String getLogo() {
-        return logo;
-    }
-
-    /**
-     * 设置logo图
-     *
-     * @param logo logo图
-     */
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    /**
-     * 获取类型 1菜单2叶子菜单
-     *
-     * @return type - 类型 1菜单2叶子菜单
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * 设置类型 1菜单2叶子菜单
-     *
-     * @param type 类型 1菜单2叶子菜单
-     */
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    /**
-     * 获取是否允许点击 1无子菜单 2有子菜单
-     *
-     * @return is_action - 是否允许点击 1无子菜单 2有子菜单
-     */
-    public String getIsAction() {
-        return isAction;
-    }
-
-    /**
-     * 设置是否允许点击 1无子菜单 2有子菜单
-     *
-     * @param isAction 是否允许点击 1无子菜单 2有子菜单
-     */
-    public void setIsAction(String isAction) {
-        this.isAction = isAction;
-    }
-
-    /**
-     * 获取状态 1正常 2禁用
-     *
-     * @return status - 状态 1正常 2禁用
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 1正常 2禁用
-     *
-     * @param status 状态 1正常 2禁用
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取跳转地址
-     *
-     * @return url - 跳转地址
-     */
-    public String getUrl() {
-        return url;
-    }
-
-    /**
-     * 设置跳转地址
-     *
-     * @param url 跳转地址
-     */
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    /**
-     * 获取前端排版
-     *
-     * @return composing_key - 前端排版
-     */
-    public String getComposingKey() {
-        return composingKey;
-    }
-
-    /**
-     * 设置前端排版
-     *
-     * @param composingKey 前端排版
-     */
-    public void setComposingKey(String composingKey) {
-        this.composingKey = composingKey;
-    }
-
-    /**
-     * 获取排序
-     *
-     * @return seq - 排序
-     */
-    public Integer getSeq() {
-        return seq;
-    }
-
-    /**
-     * 设置排序
-     *
-     * @param seq 排序
-     */
-    public void setSeq(Integer seq) {
-        this.seq = seq;
-    }
-
-    /**
-     * 获取上级菜单
-     *
-     * @return parent_id - 上级菜单
-     */
-    public String getParentId() {
-        return parentId;
-    }
-
-    /**
-     * 设置上级菜单
-     *
-     * @param parentId 上级菜单
-     */
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    /**
-     * 获取创建人
-     *
-     * @return create_user_id - 创建人
-     */
-    public String getCreateUserId() {
-        return createUserId;
-    }
-
-    /**
-     * 设置创建人
-     *
-     * @param createUserId 创建人
-     */
-    public void setCreateUserId(String createUserId) {
-        this.createUserId = createUserId;
-    }
-
-    /**
-     * 获取更新人
-     *
-     * @return update_user_id - 更新人
-     */
-    public String getUpdateUserId() {
-        return updateUserId;
-    }
-
-    /**
-     * 设置更新人
-     *
-     * @param updateUserId 更新人
-     */
-    public void setUpdateUserId(String updateUserId) {
-        this.updateUserId = updateUserId;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取更新时间
-     *
-     * @return update_time - 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updateTime 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-
-}

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

@@ -1,348 +0,0 @@
-package com.txz.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.util.Date;
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.Operator")
-@Table(name = "c_operator")
-public class Operator {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 用户id
-     */
-    @Column(name = "user_id")
-    @ApiModelProperty(value="userId用户id")
-    private Long userId;
-
-    /**
-     * 应用编号
-     */
-    @Column(name = "app_code")
-    @ApiModelProperty(value="应用编号")
-    private String appCode;
-
-    /**
-     * 支持登录类型 1，账号登录 2，手机登录 3，邮箱登录 4，微信公众号登录 
-     */
-    @Column(name = "login_type")
-    @ApiModelProperty(value="loginType支持登录类型 1，账号登录 2，手机登录 3，邮箱登录 4，微信公众号登录 ")
-    private Integer loginType;
-
-    /**
-     * 状态 1正常 2禁用
-     */
-    @ApiModelProperty(value="status状态 1正常 2禁用")
-    private Integer status;
-
-    /**
-     * 微信的unionId
-     */
-    @Column(name = "union_id")
-    @ApiModelProperty(value="unionId微信的unionId")
-    private String unionId;
-
-    /**
-     * 登录账号
-     */
-    @Column(name = "login_account")
-    @ApiModelProperty(value="loginAccount登录账号")
-    private String loginAccount;
-
-    /**
-     * 登录密码
-     */
-    @Column(name = "login_password")
-    @ApiModelProperty(value="loginPassword登录密码")
-    private String loginPassword;
-
-    /**
-     * 盐
-     */
-    @ApiModelProperty(value="salt盐")
-    private String salt;
-
-    /**
-     * 最后登录时间
-     */
-    @Column(name = "last_login_time")
-    @ApiModelProperty(value="lastLoginTime最后登录时间")
-    private Date lastLoginTime;
-
-    /**
-     * 最后登陆token
-     */
-    @Column(name = "last_token")
-    @ApiModelProperty(value="lastToken最后登陆token")
-    private String lastToken;
-
-    /**
-     * 创建人
-     */
-    @Column(name = "create_user")
-    @ApiModelProperty(value="createUser创建人")
-    private String createUser;
-
-    /**
-     * 更新人
-     */
-    @Column(name = "update_user")
-    @ApiModelProperty(value="updateUser更新人")
-    private String updateUser;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
-    private Date updateTime;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取支持登录类型 1，账号登录 2，手机登录 3，邮箱登录 4，微信公众号登录 
-     *
-     * @return login_type - 支持登录类型 1，账号登录 2，手机登录 3，邮箱登录 4，微信公众号登录 
-     */
-    public Integer getLoginType() {
-        return loginType;
-    }
-
-    /**
-     * 设置支持登录类型 1，账号登录 2，手机登录 3，邮箱登录 4，微信公众号登录 
-     *
-     * @param loginType 支持登录类型 1，账号登录 2，手机登录 3，邮箱登录 4，微信公众号登录 
-     */
-    public void setLoginType(Integer loginType) {
-        this.loginType = loginType;
-    }
-
-    /**
-     * 获取状态 1正常 2禁用
-     *
-     * @return status - 状态 1正常 2禁用
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 1正常 2禁用
-     *
-     * @param status 状态 1正常 2禁用
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取微信的unionId
-     *
-     * @return union_id - 微信的unionId
-     */
-    public String getUnionId() {
-        return unionId;
-    }
-
-    /**
-     * 设置微信的unionId
-     *
-     * @param unionId 微信的unionId
-     */
-    public void setUnionId(String unionId) {
-        this.unionId = unionId;
-    }
-
-    /**
-     * 获取登录账号
-     *
-     * @return login_account - 登录账号
-     */
-    public String getLoginAccount() {
-        return loginAccount;
-    }
-
-    /**
-     * 设置登录账号
-     *
-     * @param loginAccount 登录账号
-     */
-    public void setLoginAccount(String loginAccount) {
-        this.loginAccount = loginAccount;
-    }
-
-    /**
-     * 获取登录密码
-     *
-     * @return login_password - 登录密码
-     */
-    public String getLoginPassword() {
-        return loginPassword;
-    }
-
-    /**
-     * 设置登录密码
-     *
-     * @param loginPassword 登录密码
-     */
-    public void setLoginPassword(String loginPassword) {
-        this.loginPassword = loginPassword;
-    }
-
-    /**
-     * 获取盐
-     *
-     * @return salt - 盐
-     */
-    public String getSalt() {
-        return salt;
-    }
-
-    /**
-     * 设置盐
-     *
-     * @param salt 盐
-     */
-    public void setSalt(String salt) {
-        this.salt = salt;
-    }
-
-    /**
-     * 获取最后登录时间
-     *
-     * @return last_login_time - 最后登录时间
-     */
-    public Date getLastLoginTime() {
-        return lastLoginTime;
-    }
-
-    /**
-     * 设置最后登录时间
-     *
-     * @param lastLoginTime 最后登录时间
-     */
-    public void setLastLoginTime(Date lastLoginTime) {
-        this.lastLoginTime = lastLoginTime;
-    }
-
-    /**
-     * 获取最后登陆token
-     *
-     * @return last_token - 最后登陆token
-     */
-    public String getLastToken() {
-        return lastToken;
-    }
-
-    /**
-     * 设置最后登陆token
-     *
-     * @param lastToken 最后登陆token
-     */
-    public void setLastToken(String lastToken) {
-        this.lastToken = lastToken;
-    }
-
-    /**
-     * 获取创建人
-     *
-     * @return create_user - 创建人
-     */
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    /**
-     * 设置创建人
-     *
-     * @param createUser 创建人
-     */
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser;
-    }
-
-    /**
-     * 获取更新人
-     *
-     * @return update_user - 更新人
-     */
-    public String getUpdateUser() {
-        return updateUser;
-    }
-
-    /**
-     * 设置更新人
-     *
-     * @param updateUser 更新人
-     */
-    public void setUpdateUser(String updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取更新时间
-     *
-     * @return update_time - 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updateTime 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-}

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

@@ -1,377 +0,0 @@
-package com.txz.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.Order")
-@Table(name = "c_order")
-public class Order {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Integer id;
-
-    /**
-     * 流水号
-     */
-    @Column(name = "flow_no")
-    @ApiModelProperty(value="flowNo流水号")
-    private String flowNo;
-
-    @Column(name = "biz_no")
-    @ApiModelProperty(value="外部业务号")
-    private String bizNo;
-
-
-    /**
-     * 应用编号
-     */
-    @Column(name = "app_code")
-    @ApiModelProperty(value="appCode应用编号")
-    private String appCode;
-
-    /**
-     * 微信的appId
-     */
-    @Column(name = "out_app_id")
-    @ApiModelProperty(value="outAppId微信的appId")
-    private String outAppId;
-
-    /**
-     * 商户号id
-     */
-    @Column(name = "mch_id")
-    @ApiModelProperty(value="mchId商户号id")
-    private String mchId;
-
-    @Column(name = "devcie_id")
-    @ApiModelProperty(value="设备id")
-    private Integer devcieId;
-
-    @Column(name = "devcie_no")
-    @ApiModelProperty(value="设备序列号")
-    private String devcieNo;
-
-
-    @Column(name = "ukey_no")
-    @ApiModelProperty(value="u盾序列号")
-    private String ukeyNo;
-
-    @Column(name = "delivery_status")
-    @ApiModelProperty(value="发货状态 1未发货 2已发货")
-    private Integer deliveryStatus;
-
-
-    /**
-     * 商品id 
-     */
-    @Column(name = "goods_info")
-    @ApiModelProperty(value="商品信息 ")
-    private String goodsInfo;
-
-    /**
-     * 商品名称
-     */
-    @Column(name = "goods_name")
-    @ApiModelProperty(value="goodsName商品名称")
-    private String goodsName;
-
-    /**
-     * 支付方式 1微信 2支付宝
-     */
-    @Column(name = "pay_type")
-    @ApiModelProperty(value="payType支付方式 1微信 2支付宝")
-    private Byte payType;
-
-    /**
-     * 状态 0待支付 1已支付 2支付失败  3用户已支付，待确认  4已退款 5部分退款 
-     */
-    @ApiModelProperty(value="status状态 0待支付 1已支付 2支付失败  3用户已支付，待确认  4已退款 5部分退款 ")
-    private Byte status;
-
-    /**
-     * 交易金额
-     */
-    @ApiModelProperty(value="amount交易金额")
-    private BigDecimal amount;
-
-    /**
-     * 已退款金额
-     */
-    @Column(name = "refund_amount")
-    @ApiModelProperty(value="refundAmount已退款金额")
-    private BigDecimal refundAmount;
-
-    /**
-     * 付款时间
-     */
-    @Column(name = "pay_time")
-    @ApiModelProperty(value="payTime付款时间")
-    private Date payTime;
-
-    /**
-     * 查询次数
-     */
-    @Column(name = "query_num")
-    @ApiModelProperty(value="queryNum查询次数")
-    private Integer queryNum;
-
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime")
-    private Date createTime;
-
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime")
-    private Date updateTime;
-
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取流水号
-     *
-     * @return flow_no - 流水号
-     */
-    public String getFlowNo() {
-        return flowNo;
-    }
-
-    /**
-     * 设置流水号
-     *
-     * @param flowNo 流水号
-     */
-    public void setFlowNo(String flowNo) {
-        this.flowNo = flowNo;
-    }
-
-    /**
-     * 获取应用编号
-     *
-     * @return app_code - 应用编号
-     */
-    public String getAppCode() {
-        return appCode;
-    }
-
-    /**
-     * 设置应用编号
-     *
-     * @param appCode 应用编号
-     */
-    public void setAppCode(String appCode) {
-        this.appCode = appCode;
-    }
-
-    /**
-     * 获取微信的appId
-     *
-     * @return out_app_id - 微信的appId
-     */
-    public String getOutAppId() {
-        return outAppId;
-    }
-
-    /**
-     * 设置微信的appId
-     *
-     * @param outAppId 微信的appId
-     */
-    public void setOutAppId(String outAppId) {
-        this.outAppId = outAppId;
-    }
-
-    /**
-     * 获取商户号id
-     *
-     * @return mch_id - 商户号id
-     */
-    public String getMchId() {
-        return mchId;
-    }
-
-    /**
-     * 设置商户号id
-     *
-     * @param mchId 商户号id
-     */
-    public void setMchId(String mchId) {
-        this.mchId = mchId;
-    }
-
-
-    /**
-     * 获取商品名称
-     *
-     * @return goods_name - 商品名称
-     */
-    public String getGoodsName() {
-        return goodsName;
-    }
-
-    /**
-     * 设置商品名称
-     *
-     * @param goodsName 商品名称
-     */
-    public void setGoodsName(String goodsName) {
-        this.goodsName = goodsName;
-    }
-
-    /**
-     * 获取支付方式 1微信 2支付宝
-     *
-     * @return pay_type - 支付方式 1微信 2支付宝
-     */
-    public Byte getPayType() {
-        return payType;
-    }
-
-    /**
-     * 设置支付方式 1微信 2支付宝
-     *
-     * @param payType 支付方式 1微信 2支付宝
-     */
-    public void setPayType(Byte payType) {
-        this.payType = payType;
-    }
-
-    /**
-     * 获取状态 0待支付 1已支付 2支付失败  3用户已支付，待确认  4已退款 5部分退款 
-     *
-     * @return status - 状态 0待支付 1已支付 2支付失败  3用户已支付，待确认  4已退款 5部分退款 
-     */
-    public Byte getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 0待支付 1已支付 2支付失败  3用户已支付，待确认  4已退款 5部分退款 
-     *
-     * @param status 状态 0待支付 1已支付 2支付失败  3用户已支付，待确认  4已退款 5部分退款 
-     */
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取交易金额
-     *
-     * @return amount - 交易金额
-     */
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    /**
-     * 设置交易金额
-     *
-     * @param amount 交易金额
-     */
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    /**
-     * 获取已退款金额
-     *
-     * @return refund_amount - 已退款金额
-     */
-    public BigDecimal getRefundAmount() {
-        return refundAmount;
-    }
-
-    /**
-     * 设置已退款金额
-     *
-     * @param refundAmount 已退款金额
-     */
-    public void setRefundAmount(BigDecimal refundAmount) {
-        this.refundAmount = refundAmount;
-    }
-
-    /**
-     * 获取付款时间
-     *
-     * @return pay_time - 付款时间
-     */
-    public Date getPayTime() {
-        return payTime;
-    }
-
-    /**
-     * 设置付款时间
-     *
-     * @param payTime 付款时间
-     */
-    public void setPayTime(Date payTime) {
-        this.payTime = payTime;
-    }
-
-    /**
-     * 获取查询次数
-     *
-     * @return query_num - 查询次数
-     */
-    public Integer getQueryNum() {
-        return queryNum;
-    }
-
-    /**
-     * 设置查询次数
-     *
-     * @param queryNum 查询次数
-     */
-    public void setQueryNum(Integer queryNum) {
-        this.queryNum = queryNum;
-    }
-
-    /**
-     * @return create_time
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * @param createTime
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return update_time
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * @param updateTime
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-}

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

@@ -0,0 +1,134 @@
+package com.txz.cif.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+
+@ApiModel(value="com.txz.cif.model.RechargeRecord")
+@Table(name = "c_recharge_record")
+public class RechargeRecord {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @Column(name = "order_no")
+    @ApiModelProperty(value="orderNo订单号")
+    private String orderNo;
+
+    /**
+     * 用户id
+     */
+    @Column(name = "user_id")
+    @ApiModelProperty(value="userId用户id")
+    private Long userId;
+
+    /**
+     * 交易金额
+     */
+    @ApiModelProperty(value="amount交易金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value="折扣金额")
+    private BigDecimal discount;
+
+    /**
+     * 状态 1处理中 2充值成功 3充值失败 4超时取消
+     */
+    @ApiModelProperty(value="status状态 1处理中 2充值成功 3充值失败 4超时取消")
+    private Integer status;
+
+    /**
+     * 渠道
+     */
+    @ApiModelProperty(value="channel渠道")
+    private String channel;
+
+    /**
+     * 币种
+     */
+    @ApiModelProperty(value="currency币种")
+    private String currency;
+
+    /**
+     * 用户名
+     */
+    @Column(name = "user_name")
+    @ApiModelProperty(value="userName用户名")
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @Column(name = "user_phone")
+    @ApiModelProperty(value="userPhone手机号")
+    private String userPhone;
+
+    /**
+     * 交易时间
+     */
+    @Column(name = "trans_time")
+    @ApiModelProperty(value="transTime交易时间")
+    private Date transTime;
+
+    /**
+     * 交易成功时间
+     */
+    @Column(name = "success_time")
+    @ApiModelProperty(value="successTime交易成功时间")
+    private Date successTime;
+
+    /**
+     * 商品id
+     */
+    @Column(name = "goods_id")
+    @ApiModelProperty(value="goodsId商品id")
+    private Long goodsId;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_user")
+    @ApiModelProperty(value="createUser创建人")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @Column(name = "update_user")
+    @ApiModelProperty(value="updateUser更新人")
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    @ApiModelProperty(value="updateTime更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    @ApiModelProperty(value="createTime创建时间")
+    private Date createTime;
+
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value="version版本号")
+    private String version;
+
+}

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

@@ -1,293 +0,0 @@
-package com.txz.cif.model;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.txz.cif.web.bo.SettleBO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.Settle")
-@Table(name = "c_settle")
-public class Settle {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 组织id
-     */
-    @Column(name = "org_id")
-    @ApiModelProperty(value="orgId组织id")
-    private Long orgId;
-
-    /**
-     * 用户id
-     */
-    @Column(name = "user_id")
-    @ApiModelProperty(value="userId用户id")
-    private Long userId;
-
-    /**
-     * 2022-02
-     */
-    @ApiModelProperty(value="month2022-02")
-    private String month;
-
-    /**
-     * 状态 1未结算 2已付款
-     */
-    @ApiModelProperty(value="status状态 1未结算 2已付款")
-    private Integer status;
-
-    /**
-     * 完成病例数
-     */
-    @Column(name = "finish_size")
-    @ApiModelProperty(value="finishSize完成病例数")
-    private Integer finishSize;
-
-    /**
-     * 完成金额
-     */
-    @Column(name = "finish_amount")
-    @ApiModelProperty(value="finishAmount完成金额")
-    private BigDecimal finishAmount;
-
-    /**
-     * 结算时间
-     */
-    @Column(name = "settle_time")
-    @ApiModelProperty(value="settleTime结算时间")
-    private Date settleTime;
-
-    /**
-     * 结算人
-     */
-    @Column(name = "settle_name")
-    @ApiModelProperty(value="settleName结算人")
-    private String settleName;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime更新时间")
-    private Date updateTime;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取组织id
-     *
-     * @return org_id - 组织id
-     */
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    /**
-     * 设置组织id
-     *
-     * @param orgId 组织id
-     */
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    /**
-     * 获取用户id
-     *
-     * @return user_id - 用户id
-     */
-    public Long getUserId() {
-        return userId;
-    }
-
-    /**
-     * 设置用户id
-     *
-     * @param userId 用户id
-     */
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    /**
-     * 获取2022-02
-     *
-     * @return month - 2022-02
-     */
-    public String getMonth() {
-        return month;
-    }
-
-    /**
-     * 设置2022-02
-     *
-     * @param month 2022-02
-     */
-    public void setMonth(String month) {
-        this.month = month;
-    }
-
-    /**
-     * 获取状态 1未结算 2已付款
-     *
-     * @return status - 状态 1未结算 2已付款
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 1未结算 2已付款
-     *
-     * @param status 状态 1未结算 2已付款
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取完成病例数
-     *
-     * @return finish_size - 完成病例数
-     */
-    public Integer getFinishSize() {
-        return finishSize;
-    }
-
-    /**
-     * 设置完成病例数
-     *
-     * @param finishSize 完成病例数
-     */
-    public void setFinishSize(Integer finishSize) {
-        this.finishSize = finishSize;
-    }
-
-    /**
-     * 获取完成金额
-     *
-     * @return finish_amount - 完成金额
-     */
-    public BigDecimal getFinishAmount() {
-        return finishAmount;
-    }
-
-    /**
-     * 设置完成金额
-     *
-     * @param finishAmount 完成金额
-     */
-    public void setFinishAmount(BigDecimal finishAmount) {
-        this.finishAmount = finishAmount;
-    }
-
-    /**
-     * 获取结算时间
-     *
-     * @return settle_time - 结算时间
-     */
-    public Date getSettleTime() {
-        return settleTime;
-    }
-
-    /**
-     * 设置结算时间
-     *
-     * @param settleTime 结算时间
-     */
-    public void setSettleTime(Date settleTime) {
-        this.settleTime = settleTime;
-    }
-
-    /**
-     * 获取结算人
-     *
-     * @return settle_name - 结算人
-     */
-    public String getSettleName() {
-        return settleName;
-    }
-
-    /**
-     * 设置结算人
-     *
-     * @param settleName 结算人
-     */
-    public void setSettleName(String settleName) {
-        this.settleName = settleName;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * 获取更新时间
-     *
-     * @return update_time - 更新时间
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * 设置更新时间
-     *
-     * @param updateTime 更新时间
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public SettleBO generator() {
-        SettleBO bo = BeanUtil.toBean(this,SettleBO.class);
-        bo.setSettleId(this.id);
-        return bo;
-    }
-}

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

@@ -1,69 +0,0 @@
-package com.txz.cif.model;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.txz.cif.web.bo.SettleInventoryBO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.math.BigDecimal;
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.SettleInventory")
-@Table(name = "c_settle_inventory")
-public class SettleInventory {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    @Column(name = "plan_id")
-    @ApiModelProperty(value="planId")
-    private Long planId;
-
-    /**
-     * 系统分类
-     */
-    @Column(name = "sys_type")
-    @ApiModelProperty(value="sysType系统分类")
-    private Integer sysType;
-
-    /**
-     * 切片数区间下限
-     */
-    @Column(name = "start_size")
-    @ApiModelProperty(value="startSize切片数区间下限")
-    private Integer startSize;
-
-    /**
-     * 切片数区间上限（无上限可设置为999999）
-     */
-    @Column(name = "end_size")
-    @ApiModelProperty(value="endSize切片数区间上限（无上限可设置为999999）")
-    private Integer endSize;
-
-    /**
-     * 业务类型 1常规 2冰冻 3疑难
-     */
-    @Column(name = "biz_type")
-    @ApiModelProperty(value="bizType业务类型 1常规 2冰冻 3疑难")
-    private Integer bizType;
-
-    /**
-     * 金额
-     */
-    @ApiModelProperty(value="amount金额")
-    private BigDecimal amount;
-
-
-    public SettleInventoryBO generator() {
-        SettleInventoryBO bo = BeanUtil.toBean(this,SettleInventoryBO.class);
-//        bo.setInventoryId(this.id);
-        return bo;
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.txz.cif.model;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.txz.cif.web.bo.SettlePlanBO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
-import javax.persistence.*;
-
-@ApiModel(value="com.medipath.cif.model.SettlePlan")
-@Table(name = "c_settle_plan")
-public class SettlePlan {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    @ApiModelProperty(value="name")
-    private String name;
-
-    /**
-     * 类型 1月结 2季结
-     */
-    @ApiModelProperty(value="type类型 1月结 2季结")
-    private Integer type;
-
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime")
-    private Date createTime;
-
-    @Column(name = "update_time")
-    @ApiModelProperty(value="updateTime")
-    private Date updateTime;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * @return name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取类型 1月结 2季结
-     *
-     * @return type - 类型 1月结 2季结
-     */
-    public Integer getType() {
-        return type;
-    }
-
-    /**
-     * 设置类型 1月结 2季结
-     *
-     * @param type 类型 1月结 2季结
-     */
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    /**
-     * @return create_time
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * @param createTime
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * @return update_time
-     */
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * @param updateTime
-     */
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public SettlePlanBO generator() {
-        SettlePlanBO bo = BeanUtil.toBean(this,SettlePlanBO.class);
-        bo.setSettlePlanId(this.id);
-        return bo;
-    }
-}

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

@@ -1,248 +0,0 @@
-package com.txz.cif.model;
-
-import cn.hutool.core.bean.BeanUtil;
-import com.txz.cif.web.bo.SysMessageBO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.util.Date;
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.SysMessage")
-@Table(name = "c_sys_message")
-public class SysMessage {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 用户id
-     */
-    @Column(name = "user_id")
-    @ApiModelProperty(value="userId用户id")
-    private Long userId;
-
-    /**
-     * 模板id
-     */
-    @Column(name = "template_id")
-    @ApiModelProperty(value="templateId模板id")
-    private Long templateId;
-
-    /**
-     * 发送用户id
-     */
-    @Column(name = "send_user_id")
-    @ApiModelProperty(value="sendUserId发送用户id")
-    private String sendUserId;
-
-
-    @Column(name = "biz_data")
-    @ApiModelProperty(value="业务数据")
-    private String bizData;
-
-
-    /**
-     * 业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     */
-    @Column(name = "biz_type")
-    @ApiModelProperty(value="bizType业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算")
-    private Integer bizType;
-
-    /**
-     * 内容
-     */
-    @ApiModelProperty(value="content内容")
-    private String content;
-
-    /**
-     * 状态 1未读 2已读
-     */
-    @ApiModelProperty(value="status状态 1未读 2已读")
-    private Integer status;
-
-    /**
-     * 已读时间
-     */
-    @Column(name = "read_time")
-    @ApiModelProperty(value="readTime已读时间")
-    private Date readTime;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取用户id
-     *
-     * @return user_id - 用户id
-     */
-    public Long getUserId() {
-        return userId;
-    }
-
-    /**
-     * 设置用户id
-     *
-     * @param userId 用户id
-     */
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    /**
-     * 获取模板id
-     *
-     * @return template_id - 模板id
-     */
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    /**
-     * 设置模板id
-     *
-     * @param templateId 模板id
-     */
-    public void setTemplateId(Long templateId) {
-        this.templateId = templateId;
-    }
-
-    /**
-     * 获取发送用户id
-     *
-     * @return send_user_id - 发送用户id
-     */
-    public String getSendUserId() {
-        return sendUserId;
-    }
-
-    /**
-     * 设置发送用户id
-     *
-     * @param sendUserId 发送用户id
-     */
-    public void setSendUserId(String sendUserId) {
-        this.sendUserId = sendUserId;
-    }
-
-    /**
-     * 获取业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     *
-     * @return biz_type - 业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     */
-    public Integer getBizType() {
-        return bizType;
-    }
-
-    /**
-     * 设置业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     *
-     * @param bizType 业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     */
-    public void setBizType(Integer bizType) {
-        this.bizType = bizType;
-    }
-
-    /**
-     * 获取内容
-     *
-     * @return content - 内容
-     */
-    public String getContent() {
-        return content;
-    }
-
-    /**
-     * 设置内容
-     *
-     * @param content 内容
-     */
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    /**
-     * 获取状态 1未读 2已读
-     *
-     * @return status - 状态 1未读 2已读
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * 设置状态 1未读 2已读
-     *
-     * @param status 状态 1未读 2已读
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    /**
-     * 获取已读时间
-     *
-     * @return read_time - 已读时间
-     */
-    public Date getReadTime() {
-        return readTime;
-    }
-
-    /**
-     * 设置已读时间
-     *
-     * @param readTime 已读时间
-     */
-    public void setReadTime(Date readTime) {
-        this.readTime = readTime;
-    }
-
-    /**
-     * 获取创建时间
-     *
-     * @return create_time - 创建时间
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * 设置创建时间
-     *
-     * @param createTime 创建时间
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public SysMessageBO generator() {
-        SysMessageBO bo = BeanUtil.toBean(this, SysMessageBO.class);
-        bo.setMessageId(this.id);
-        return bo;
-    }
-}

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

@@ -1,114 +0,0 @@
-package com.txz.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.SysMessageTemplate")
-@Table(name = "c_sys_message_template")
-public class SysMessageTemplate {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 名称
-     */
-    @ApiModelProperty(value="name名称")
-    private String name;
-
-    /**
-     * 业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     */
-    @Column(name = "biz_type")
-    @ApiModelProperty(value="bizType业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算")
-    private Integer bizType;
-
-    @ApiModelProperty(value="语言")
-    private String  language;
-
-
-    /**
-     * 内容
-     */
-    @ApiModelProperty(value="content内容")
-    private String content;
-
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取名称
-     *
-     * @return name - 名称
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * 设置名称
-     *
-     * @param name 名称
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    /**
-     * 获取业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     *
-     * @return biz_type - 业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     */
-    public Integer getBizType() {
-        return bizType;
-    }
-
-    /**
-     * 设置业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     *
-     * @param bizType 业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     */
-    public void setBizType(Integer bizType) {
-        this.bizType = bizType;
-    }
-
-    /**
-     * 获取内容
-     *
-     * @return content - 内容
-     */
-    public String getContent() {
-        return content;
-    }
-
-    /**
-     * 设置内容
-     *
-     * @param content 内容
-     */
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-
-}

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

@@ -4,6 +4,7 @@ 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.*;
@@ -18,57 +19,51 @@ import javax.persistence.*;
 @Builder
 @ApiModel(value="com.medipath.cif.model.User")
 @Table(name = "c_user")
-public class User {
+public class User  {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @ApiModelProperty(value="id")
     private Long id;
 
-    @Column(name = "sign_url")
-    @ApiModelProperty(value="签名地址")
-    private String signUrl;
-
-    @ApiModelProperty(value="看图习惯")
-    private String habit;
-
     /**
-     * 应用编号
+     * pid
      */
-    @Column(name = "app_code")
-    @ApiModelProperty(value="应用编号")
-    private String appCode;
+    @ApiModelProperty(value="pidpid")
+    private Long pid;
 
-    @ApiModelProperty(value="特长")
-    private String strong;
+    /**
+     * 爷爷id
+     */
+    @ApiModelProperty(value="ppid爷爷id")
+    private Long ppid;
 
     /**
-     * 简介
+     * 用户号
      */
-    @ApiModelProperty(value="简介")
-    private String introductory;
+    @Column(name = "user_no")
+    @ApiModelProperty(value="userId用户号")
+    private String userNo;
 
+    @ApiModelProperty(value="语言")
+    private String  language;
 
-    @ApiModelProperty(value="科室名称")
-    private String department;
 
-    /**
-     * 资金账户（目前只有一个）
-     */
-    @Column(name = "account_id")
-    @ApiModelProperty(value="accountId资金账户（目前只有一个）")
-    private Long accountId;
+    @Column(name = "last_token")
+    @ApiModelProperty(value="token" )
+    private String  lastToken;
 
     /**
-     * 单位
+     * 邀请码
      */
-    @ApiModelProperty(value="unit单位")
-    private String unit;
+    @Column(name = "invited_code")
+    @ApiModelProperty(value="invitedCode邀请码")
+    private String invitedCode;
 
     /**
-     * 名字
+     * 昵称
      */
-    @ApiModelProperty(value="name名字")
-    private String name;
+    @ApiModelProperty(value="nickname昵称")
+    private String nickname;
 
     /**
      * 身份证号
@@ -77,93 +72,63 @@ public class User {
     private String identity;
 
     /**
-     * 状态 0未启用 1正常 2禁用 3停用 4锁定
-     */
-    @ApiModelProperty(value="status状态 0未启用 1正常 2禁用 3停用 4锁定")
-    private Byte status;
-
-    /**
-     * 工作状态 1空闲 2不接诊
+     * 头像
      */
-    @Column(name = "work_status")
-    @ApiModelProperty(value="workStatus工作状态 1空闲 2不接诊")
-    private Byte workStatus;
-
-    @Column(name = "sys_types")
-    @ApiModelProperty(value="所属系统多个使用，分割 ")
-    private String sysTypes;
+    @Column(name = "head_pic")
+    @ApiModelProperty(value="headPic头像")
+    private String headPic;
 
     /**
-     * 电话
+     * 性别 0未知 1男 2女
      */
-    @Column(name = "phone_no")
-    @ApiModelProperty(value="phoneNo电话")
-    private String phoneNo;
-
-    @Column(name = "phone_message")
-    @ApiModelProperty(value="电话消息 1接收 2不接收")
-    private Integer phoneMessage;
-
-    @ApiModelProperty(value="用户类型 1专家组 2专家 3医院")
-    private Integer type;
-
+    @ApiModelProperty(value="sex性别 0未知 1男 2女")
+    private Byte sex;
 
     /**
-     * 邮箱
+     * 状态  1正常 2禁用 3停用 4锁定
      */
-    @ApiModelProperty(value="email邮箱")
-    private String email;
-
-    @Column(name = "email_message")
-    @ApiModelProperty(value="邮箱消息 1接收 2不接收")
-    private Integer emailMessage;
-
-    @Column(name = "instation_message")
-    @ApiModelProperty(value="站内消息 1接收 2不接收")
-    private Integer instationMessage;
-
-    @ApiModelProperty(value="语言")
-    private String  language;
+    @ApiModelProperty(value="status状态  1正常 2禁用 3停用 4锁定")
+    private Byte status;
 
     /**
-     * 头像
+     * 银行
      */
-    @Column(name = "icon")
-    @ApiModelProperty(value="icon")
-    private String icon;
+    @ApiModelProperty(value="bank银行")
+    private String bank;
 
     /**
-     * 居住地址
+     * 名字
      */
-    @ApiModelProperty(value="address居住地址")
-    private String address;
+    @ApiModelProperty(value="name名字")
+    private String name;
 
     /**
-     * 性别 0未知 1男 2女
+     * 电话
      */
-    @ApiModelProperty(value="sex性别 0未知 1男 2女")
-    private Byte sex;
+    @Column(name = "phone_no")
+    @ApiModelProperty(value="phoneNo电话")
+    private String phoneNo;
 
     /**
-     * 所属省份代码
+     * 银行账号
      */
-    @Column(name = "province_code")
-    @ApiModelProperty(value="provinceCode所属省份代码")
-    private String provinceCode;
+    @Column(name = "bank_account")
+    @ApiModelProperty(value="bankAccount银行账号")
+    private String bankAccount;
 
     /**
-     * 所属城市码
+     * vip等级
      */
-    @Column(name = "city_code")
-    @ApiModelProperty(value="cityCode所属城市码")
-    private String cityCode;
+    @Column(name = "vip_level")
+    @ApiModelProperty(value="vipLevelvip等级")
+    private Integer vipLevel;
 
     /**
-     * 所属区域代码
+     * 最后登录时间
      */
-    @Column(name = "area_code")
-    @ApiModelProperty(value="areaCode所属区域代码")
-    private String areaCode;
+    @Column(name = "last_login_time")
+    @ApiModelProperty(value="lastLoginTime最后登录时间")
+    private Date lastLoginTime;
 
     /**
      * 创建人
@@ -179,14 +144,6 @@ public class User {
     @ApiModelProperty(value="updateUser更新人")
     private String updateUser;
 
-
-    /**
-     * 最后请求时间
-     */
-    @Column(name = "last_time")
-    @ApiModelProperty(value="最后请求时间")
-    private Date lastTime;
-
     /**
      * 更新时间
      */
@@ -207,6 +164,25 @@ public class User {
     @ApiModelProperty(value="version版本号")
     private String version;
 
+    /**
+     * 删除状态 1未删除 2已删除
+     */
+    @Column(name = "is_delete")
+    @ApiModelProperty(value="isDelete删除状态 1未删除 2已删除")
+    private Byte isDelete;
+
+    /**
+     * 密码
+     */
+    @ApiModelProperty(value="pwd密码")
+    private String pwd;
+
+    /**
+     * 盐
+     */
+    @ApiModelProperty(value="salt盐")
+    private String salt;
+
 
 
     public UserInfoBO generator() {

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

@@ -1,62 +0,0 @@
-package com.txz.cif.model;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import java.util.Date;
-import javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="com.medipath.cif.model.UserLog")
-@Table(name = "c_user_log")
-public class UserLog {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty(value="id")
-    private Long id;
-
-    /**
-     * 应用编号
-     */
-    @Column(name = "app_code")
-    @ApiModelProperty(value="应用编号")
-    private String appCode;
-
-    /**
-     * 业务id
-     */
-    @Column(name = "biz_id")
-    @ApiModelProperty(value="bizId业务id")
-    private Long bizId;
-
-    /**
-     * 类型 1用户登录 2组织登录 3医院登录 4销售登录
-     */
-    @ApiModelProperty(value="type类型 1用户登录 2组织登录 3医院登录 4销售登录")
-    private Integer type;
-
-    /**
-     * 版本
-     */
-    @ApiModelProperty(value="version版本")
-    private String version;
-
-    /**
-     * ip
-     */
-    @ApiModelProperty(value="ipip")
-    private String ip;
-
-    /**
-     * 创建时间
-     */
-    @Column(name = "create_time")
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-}

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

@@ -0,0 +1,430 @@
+package com.txz.cif.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import javax.persistence.*;
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@ApiModel(value="com.txz.cif.model.WithdrawRecord")
+@Table(name = "c_withdraw_record")
+public class WithdrawRecord {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @ApiModelProperty(value="id")
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @Column(name = "order_no")
+    @ApiModelProperty(value="orderNo订单号")
+    private String orderNo;
+
+    /**
+     * 用户id
+     */
+    @Column(name = "user_id")
+    @ApiModelProperty(value="userId用户id")
+    private Long userId;
+
+    /**
+     * 交易金额
+     */
+    @ApiModelProperty(value="amount交易金额")
+    private BigDecimal amount;
+
+    /**
+     * 手续费
+     */
+    @ApiModelProperty(value="fee手续费")
+    private BigDecimal fee;
+
+    /**
+     * 状态 1处理中 2提现成功 3提现失败 4超时取消
+     */
+    @ApiModelProperty(value="status状态 1处理中 2提现成功 3提现失败 4超时取消")
+    private Integer status;
+
+    /**
+     * 渠道
+     */
+    @ApiModelProperty(value="channel渠道")
+    private String channel;
+
+    /**
+     * 币种
+     */
+    @ApiModelProperty(value="currency币种")
+    private String currency;
+
+    /**
+     * 用户名
+     */
+    @Column(name = "user_name")
+    @ApiModelProperty(value="userName用户名")
+    private String userName;
+
+    /**
+     * 手机号
+     */
+    @Column(name = "user_phone")
+    @ApiModelProperty(value="userPhone手机号")
+    private String userPhone;
+
+    /**
+     * 交易时间
+     */
+    @Column(name = "trans_time")
+    @ApiModelProperty(value="transTime交易时间")
+    private Date transTime;
+
+    /**
+     * 交易成功时间
+     */
+    @Column(name = "success_time")
+    @ApiModelProperty(value="successTime交易成功时间")
+    private Date successTime;
+
+    /**
+     * 创建人
+     */
+    @Column(name = "create_user")
+    @ApiModelProperty(value="createUser创建人")
+    private String createUser;
+
+    /**
+     * 更新人
+     */
+    @Column(name = "update_user")
+    @ApiModelProperty(value="updateUser更新人")
+    private String updateUser;
+
+    /**
+     * 更新时间
+     */
+    @Column(name = "update_time")
+    @ApiModelProperty(value="updateTime更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    @ApiModelProperty(value="createTime创建时间")
+    private Date createTime;
+
+    /**
+     * 版本号
+     */
+    @ApiModelProperty(value="version版本号")
+    private String version;
+
+    /**
+     * @return id
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取订单号
+     *
+     * @return order_no - 订单号
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * 设置订单号
+     *
+     * @param orderNo 订单号
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * 获取用户id
+     *
+     * @return user_id - 用户id
+     */
+    public Long getUserId() {
+        return userId;
+    }
+
+    /**
+     * 设置用户id
+     *
+     * @param userId 用户id
+     */
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * 获取交易金额
+     *
+     * @return amount - 交易金额
+     */
+    public BigDecimal getAmount() {
+        return amount;
+    }
+
+    /**
+     * 设置交易金额
+     *
+     * @param amount 交易金额
+     */
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
+    }
+
+    /**
+     * 获取手续费
+     *
+     * @return fee - 手续费
+     */
+    public BigDecimal getFee() {
+        return fee;
+    }
+
+    /**
+     * 设置手续费
+     *
+     * @param fee 手续费
+     */
+    public void setFee(BigDecimal fee) {
+        this.fee = fee;
+    }
+
+    /**
+     * 获取状态 1处理中 2提现成功 3提现失败 4超时取消
+     *
+     * @return status - 状态 1处理中 2提现成功 3提现失败 4超时取消
+     */
+    public Integer getStatus() {
+        return status;
+    }
+
+    /**
+     * 设置状态 1处理中 2提现成功 3提现失败 4超时取消
+     *
+     * @param status 状态 1处理中 2提现成功 3提现失败 4超时取消
+     */
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    /**
+     * 获取渠道
+     *
+     * @return channel - 渠道
+     */
+    public String getChannel() {
+        return channel;
+    }
+
+    /**
+     * 设置渠道
+     *
+     * @param channel 渠道
+     */
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    /**
+     * 获取币种
+     *
+     * @return currency - 币种
+     */
+    public String getCurrency() {
+        return currency;
+    }
+
+    /**
+     * 设置币种
+     *
+     * @param currency 币种
+     */
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    /**
+     * 获取用户名
+     *
+     * @return user_name - 用户名
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * 设置用户名
+     *
+     * @param userName 用户名
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * 获取手机号
+     *
+     * @return user_phone - 手机号
+     */
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    /**
+     * 设置手机号
+     *
+     * @param userPhone 手机号
+     */
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    /**
+     * 获取交易时间
+     *
+     * @return trans_time - 交易时间
+     */
+    public Date getTransTime() {
+        return transTime;
+    }
+
+    /**
+     * 设置交易时间
+     *
+     * @param transTime 交易时间
+     */
+    public void setTransTime(Date transTime) {
+        this.transTime = transTime;
+    }
+
+    /**
+     * 获取交易成功时间
+     *
+     * @return success_time - 交易成功时间
+     */
+    public Date getSuccessTime() {
+        return successTime;
+    }
+
+    /**
+     * 设置交易成功时间
+     *
+     * @param successTime 交易成功时间
+     */
+    public void setSuccessTime(Date successTime) {
+        this.successTime = successTime;
+    }
+
+    /**
+     * 获取创建人
+     *
+     * @return create_user - 创建人
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * 设置创建人
+     *
+     * @param createUser 创建人
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * 获取更新人
+     *
+     * @return update_user - 更新人
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * 设置更新人
+     *
+     * @param updateUser 更新人
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * 获取更新时间
+     *
+     * @return update_time - 更新时间
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取创建时间
+     *
+     * @return create_time - 创建时间
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取版本号
+     *
+     * @return version - 版本号
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * 设置版本号
+     *
+     * @param version 版本号
+     */
+    public void setVersion(String version) {
+        this.version = version;
+    }
+}

cif-service/src/main/java/com/txz/cif/service/AccountFlowService.java

@@ -12,24 +12,5 @@ import java.util.Map;
  */
 public interface AccountFlowService extends Service<AccountFlow> {
 
-    List<IndexCollectBO> sumAmount(Map<String, Object> map);
 
-    IndexCollectBO countBizId(Map<String, Object> map);
-
-    /**
-     * 查询某个科目下时间段的出入流水总金额
-     * @param aliases 获取别名（101）
-     * @param type 类型 1出金 2入金
-     * @param startTime 开始时间 2022-10-01 00:00:00 包含
-     * @param endTime 结束时间 2022-10-02 00:00:00 不包含
-     * @return
-     */
-    BigDecimal sumOccur(String aliases, int type, String startTime, String endTime);
-
-    /**
-     * 年支出
-     * @param accountId
-     * @return
-     */
-    BigDecimal sumYearExpenditureAmount(Long accountId);
 }

cif-service/src/main/java/com/txz/cif/service/ApplicationService.java

@@ -1,25 +0,0 @@
-package com.txz.cif.service;
-
-import com.txz.cif.core.Service;
-import com.txz.cif.model.Application;
-
-/**
- * Created by CodeGenerator on 2020/04/13.
- */
-public interface ApplicationService extends Service<Application> {
-
-    /**
-     * 通过appcode获取应用信息
-     * @param appCode
-     * @return
-     */
-    Application getApplication(String appCode);
-
-    /**
-     * 通过appId获取应用信息
-     * @param appId
-     * @return
-     */
-    Application getByAppId(String appId);
-
-}

cif-service/src/main/java/com/txz/cif/service/BannerService.java

@@ -1,11 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.Banner;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-public interface BannerService extends Service<Banner> {
-
-}

cif-service/src/main/java/com/txz/cif/service/ConfigMemberService.java

@@ -0,0 +1,11 @@
+package com.txz.cif.service;
+import com.txz.cif.model.ConfigMember;
+import com.txz.cif.core.Service;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+public interface ConfigMemberService extends Service<ConfigMember> {
+
+}

cif-service/src/main/java/com/txz/cif/service/MenuService.java

@@ -1,11 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.Menu;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2023/01/05.
- */
-public interface MenuService extends Service<Menu> {
-
-}

cif-service/src/main/java/com/txz/cif/service/OperatorService.java

@@ -1,11 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.Operator;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-public interface OperatorService extends Service<Operator> {
-
-}

cif-service/src/main/java/com/txz/cif/service/OrderService.java

@@ -1,16 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.Order;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2023/03/18.
- */
-public interface OrderService extends Service<Order> {
-
-    void handlerPay(Order order);
-
-    Integer queryOrderStatus(String orderNo);
-
-    void delivery(String bizNo);
-}

cif-service/src/main/java/com/txz/cif/service/RechargeRecordService.java

@@ -0,0 +1,11 @@
+package com.txz.cif.service;
+import com.txz.cif.model.RechargeRecord;
+import com.txz.cif.core.Service;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+public interface RechargeRecordService extends Service<RechargeRecord> {
+
+}

cif-service/src/main/java/com/txz/cif/service/SettleInventoryService.java

@@ -1,12 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.SettleInventory;
-import com.txz.cif.core.Service;
-import tk.mybatis.mapper.entity.Condition;
-
-/**
- * Created by CodeGenerator on 2022/11/18.
- */
-public interface SettleInventoryService extends Service<SettleInventory> {
-
-    void deleteByCondition(Condition c);
-}

cif-service/src/main/java/com/txz/cif/service/SettlePlanService.java

@@ -1,11 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.SettlePlan;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/18.
- */
-public interface SettlePlanService extends Service<SettlePlan> {
-
-}

cif-service/src/main/java/com/txz/cif/service/SettleService.java

@@ -1,13 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.Settle;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/22.
- */
-public interface SettleService extends Service<Settle> {
-
-
-
-}

cif-service/src/main/java/com/txz/cif/service/SysMessageService.java

@@ -1,11 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.SysMessage;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2023/02/08.
- */
-public interface SysMessageService extends Service<SysMessage> {
-
-}

cif-service/src/main/java/com/txz/cif/service/SysMessageTemplateService.java

@@ -1,11 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.SysMessageTemplate;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2023/02/08.
- */
-public interface SysMessageTemplateService extends Service<SysMessageTemplate> {
-
-}

cif-service/src/main/java/com/txz/cif/service/UserLogService.java

@@ -1,11 +0,0 @@
-package com.txz.cif.service;
-import com.txz.cif.model.UserLog;
-import com.txz.cif.core.Service;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-public interface UserLogService extends Service<UserLog> {
-
-}

cif-service/src/main/java/com/txz/cif/service/UserService.java

@@ -18,14 +18,14 @@ public interface UserService extends Service<User> {
 
     Boolean checkCode(String email, String code);
 
-    Result<Object> resetPwd(Long operatorId, String pwd, String newPwd);
+    Result<Object> resetPwd(Long userId, String pwd, String newPwd);
 
     Boolean resetPhoneNo(Long userId, String phoneNo);
 
     Boolean resetLoginAccount(Long userId, String loginAccount);
 
 
-    Boolean resetEmail(Long userId, String email);
+//    Boolean resetEmail(Long userId, String email);
     /**
      * 创建用户
      * @param param 入参

cif-service/src/main/java/com/txz/cif/service/WithdrawRecordService.java

@@ -0,0 +1,11 @@
+package com.txz.cif.service;
+import com.txz.cif.model.WithdrawRecord;
+import com.txz.cif.core.Service;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+public interface WithdrawRecordService extends Service<WithdrawRecord> {
+
+}

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

@@ -23,31 +23,4 @@ public class AccountFlowServiceImpl extends AbstractService<AccountFlow> impleme
     @Resource
     private AccountFlowMapper cAccountFlowMapper;
 
-    @Override public List<IndexCollectBO> sumAmount(Map<String, Object> map) {
-        return cAccountFlowMapper.sumAmount(map);
-    }
-
-    @Override public IndexCollectBO countBizId(Map<String, Object> map) {
-        return cAccountFlowMapper.countBizId(map);
-    }
-
-    @Override
-    public BigDecimal sumOccur(String aliases, int type, String startTime,
-                                         String endTime) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("aliases",aliases);
-        map.put("type",type);
-        map.put("startTime",startTime);
-        map.put("endTime",endTime);
-        return cAccountFlowMapper.sumOccur(map);
-    }
-
-    @Override
-    public BigDecimal sumYearExpenditureAmount(Long accountId) {
-        BigDecimal ret  = cAccountFlowMapper.sumYearExpenditureAmount(accountId);
-        if (ret == null){
-            return BigDecimal.ZERO;
-        }
-        return ret;
-    }
 }

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

@@ -1,53 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.core.AbstractService;
-import com.txz.cif.dao.ApplicationMapper;
-import com.txz.cif.model.Application;
-import com.txz.cif.service.ApplicationService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Condition;
-import tk.mybatis.mapper.entity.Example;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-/**
- * Created by CodeGenerator on 2020/04/13.
- */
-@Service
-@Transactional
-public class ApplicationServiceImpl extends AbstractService<Application>
-        implements ApplicationService {
-    @Resource
-    private ApplicationMapper cApplicationMapper;
-
-
-    @Override
-    public Application getApplication(String appCode) {
-        Condition condition = new Condition(Application.class);
-        Example.Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("appCode", appCode);
-        criteria.andEqualTo("status", 1);
-        List<Application> applicationList = this.findByCondition(condition);
-        if (!applicationList.isEmpty()) {
-            return applicationList.get(0);
-        }
-        return null;
-    }
-
-
-    @Override
-    public Application getByAppId(String appId) {
-        Condition condition = new Condition(Application.class);
-        Example.Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("outAppId", appId);
-        criteria.andEqualTo("status", 1);
-        List<Application> applicationList = this.findByCondition(condition);
-        if (!applicationList.isEmpty()) {
-            return applicationList.get(0);
-        }
-        return null;
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.BannerMapper;
-import com.txz.cif.model.Banner;
-import com.txz.cif.service.BannerService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-@Service
-@Transactional
-public class BannerServiceImpl extends AbstractService<Banner> implements BannerService {
-    @Resource
-    private BannerMapper cBannerMapper;
-
-}

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

@@ -0,0 +1,22 @@
+package com.txz.cif.service.impl;
+
+import com.txz.cif.dao.ConfigMemberMapper;
+import com.txz.cif.model.ConfigMember;
+import com.txz.cif.service.ConfigMemberService;
+import com.txz.cif.core.AbstractService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Service
+@Transactional
+public class ConfigMemberServiceImpl extends AbstractService<ConfigMember> implements ConfigMemberService {
+    @Resource
+    private ConfigMemberMapper cConfigMemberMapper;
+
+}

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

@@ -93,26 +93,26 @@ public class DayCutServiceImpl extends AbstractService<DayCut> implements DayCut
             }
             //类型 1出金 2入金
             //借方发生额
-            BigDecimal debitAmount = accountFlowService.sumOccur(subject.getAliases(),
-                    StrUtil.equals("D",subject.getDirection())? 2 : 1,
-                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
-            if (debitAmount == null){
-                debitAmount = BigDecimal.ZERO;
-            }
+//            BigDecimal debitAmount = accountFlowService.sumOccur(subject.getAliases(),
+//                    StrUtil.equals("D",subject.getDirection())? 2 : 1,
+//                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
+//            if (debitAmount == null){
+//                debitAmount = BigDecimal.ZERO;
+//            }
             //贷方发生额
-            BigDecimal creditAmount = accountFlowService.sumOccur(subject.getAliases(),
-                    StrUtil.equals("C",subject.getDirection())? 2 : 1,
-                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
-            if (creditAmount == null){
-                creditAmount = BigDecimal.ZERO;
-            }
+//            BigDecimal creditAmount = accountFlowService.sumOccur(subject.getAliases(),
+//                    StrUtil.equals("C",subject.getDirection())? 2 : 1,
+//                    DateUtil.format(yesterday,"yyyy-MM-DD")+" 00:00:00",DateUtil.today()+" 00:00:00");
+//            if (creditAmount == null){
+//                creditAmount = BigDecimal.ZERO;
+//            }
             //保存日切数据
-            DayCut dayCut = DayCut.builder().subjectId(subject.getId()).day(yesterday)
-                    .creditAmount(creditAmount)
-                    .debitAmount(debitAmount)
-                    .createTime(DateUtil.date()).endAmount(endAmount)
-                    .initAmount(initAmount).build();
-            save(dayCut);
+//            DayCut dayCut = DayCut.builder().subjectId(subject.getId()).day(yesterday)
+//                    .creditAmount(creditAmount)
+//                    .debitAmount(debitAmount)
+//                    .createTime(DateUtil.date()).endAmount(endAmount)
+//                    .initAmount(initAmount).build();
+//            save(dayCut);
             if (StrUtil.equals("D",subject.getDirection())){
                 totalDebit = totalDebit.add(endAmount);
             } else if (StrUtil.equals("C",subject.getDirection())){

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.MenuMapper;
-import com.txz.cif.model.Menu;
-import com.txz.cif.service.MenuService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2023/01/05.
- */
-@Service
-@Transactional
-public class MenuServiceImpl extends AbstractService<Menu> implements MenuService {
-    @Resource
-    private MenuMapper cMenuMapper;
-
-}

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.OperatorMapper;
-import com.txz.cif.model.Operator;
-import com.txz.cif.service.OperatorService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-@Service
-@Transactional
-public class OperatorServiceImpl extends AbstractService<Operator> implements OperatorService {
-    @Resource
-    private OperatorMapper cOperatorMapper;
-
-}

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

@@ -1,140 +0,0 @@
-package com.txz.cif.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.alipay.api.domain.AlipayTradeQueryModel;
-import com.alipay.api.response.AlipayTradeQueryResponse;
-import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult;
-import com.github.binarywang.wxpay.constant.WxPayConstants;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.txz.cif.configurer.alipay.AliPayApi;
-import com.txz.cif.core.ResultCode;
-import com.txz.cif.core.ServiceException;
-import com.txz.cif.dao.OrderMapper;
-import com.txz.cif.model.Order;
-import com.txz.cif.mq.been.DeviceRequest;
-import com.txz.cif.mq.been.OrderRequest;
-import com.txz.cif.open.AlipayMchService;
-import com.txz.cif.service.OrderService;
-import com.txz.cif.core.AbstractService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-/**
- * Created by CodeGenerator on 2023/03/18.
- */
-@Service
-@Slf4j
-@Transactional
-public class OrderServiceImpl extends AbstractService<Order> implements OrderService {
-    @Resource
-    private OrderMapper cOrderMapper;
-
-    @Resource
-    private RabbitTemplate rabbitTemplate;
-
-//    @Autowired
-//    private WxMchService wxMchService;
-
-    @Resource
-    private WxPayService wxPayService;
-
-    @Autowired
-    private AlipayMchService alipayMchService;
-
-    @Override
-    public void handlerPay(Order order) {
-        update(Order.builder().id(order.getId()).payTime(DateUtil.date()).status((byte)1).build());
-        //发送mq消息
-        new Thread(() -> {
-            DeviceRequest<OrderRequest> request = new DeviceRequest<>();
-            request.setService("OrderPayNotify");
-            request.setTimestamp(DateUtil.current());
-            request.setData(OrderRequest.builder().bizNo(order.getBizNo())
-                    .flowNo(order.getFlowNo()).build());
-            rabbitTemplate.convertSendAndReceive(null,"AIODevice:"+order.getDevcieNo(),request.toString());
-            log.info("已发消息到mq："+ JSONUtil.toJsonStr(request));
-        }).start();
-    }
-
-    @Transactional(propagation = Propagation.NOT_SUPPORTED)
-    @Override
-    public Integer queryOrderStatus(String orderNo) {
-        Order order = findBy("flowNo", orderNo);
-        if (order == null) {
-            throw new ServiceException(ResultCode.OBJECT_IS_NULL.getMessage());
-        }
-        if (order.getStatus() ==0){
-            if (order.getPayType() == 1){
-                try{
-//                    String appId = order.getOutAppId();
-//                    wxPayService = wxMchService.switchoverTo(appId, wxPayService, false);
-//
-//                    WxPayOrderQueryResult wxPayOrderQueryResult = wxPayService.queryOrder(null, order.getFlowNo());
-//                    // 主动查询结果
-//                    if (WxPayConstants.WxpayTradeStatus.SUCCESS.equals(wxPayOrderQueryResult.getTradeState())) {
-//                        // 更新订单
-//                        handlerPay(order);
-//                        return 1;
-//                    }
-                }catch (Exception e){
-                    log.error("主动查询微信支付结果异常",e);
-                }
-            } else {
-                try {
-                    AlipayTradeQueryModel model = new AlipayTradeQueryModel();
-                    model.setOutTradeNo(order.getFlowNo());
-                    alipayMchService.switchTo(order.getOutAppId());
-                    AlipayTradeQueryResponse response = AliPayApi.tradeQueryToResponse(model);
-                    if ("TRADE_SUCCESS".equals(response.getTradeStatus())) {
-                        // 校验金额
-                        if (order.getAmount().toPlainString().equals(response.getTotalAmount())) {
-                            handlerPay( order);
-                            return 1;
-                        }
-                    }
-                }catch (Exception e){
-                    log.error("主动查询支付宝支付结果异常",e);
-                }
-            }
-        }
-        return order.getStatus().intValue();
-    }
-
-    @Override
-    public void delivery(String bizNo) {
-        try {
-
-            Condition c = new Condition(Order.class);
-            c.createCriteria().andEqualTo("bizNo",bizNo);
-            List<Order> orders = findByCondition(c);
-            if (CollUtil.isEmpty(orders)){
-                return ;
-            }
-            Order order = null;
-            for (Order temp:orders) {
-                if (temp.getStatus() == 1){
-                    order = temp;
-                }
-            }
-            if (order == null) {
-                throw new ServiceException(ResultCode.OBJECT_IS_NULL.getMessage());
-            }
-            update(Order.builder().id(order.getId()).deliveryStatus(2).build());
-        } catch (Exception e) {
-            log.error("发货异常e：", e);
-            throw new ServiceException(ResultCode.INTERNAL_SERVER_ERROR.getMessage());
-        }
-    }
-}

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

@@ -0,0 +1,22 @@
+package com.txz.cif.service.impl;
+
+import com.txz.cif.dao.RechargeRecordMapper;
+import com.txz.cif.model.RechargeRecord;
+import com.txz.cif.service.RechargeRecordService;
+import com.txz.cif.core.AbstractService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Service
+@Transactional
+public class RechargeRecordServiceImpl extends AbstractService<RechargeRecord> implements RechargeRecordService {
+    @Resource
+    private RechargeRecordMapper cRechargeRecordMapper;
+
+}

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

@@ -1,26 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.SettleInventoryMapper;
-import com.txz.cif.model.SettleInventory;
-import com.txz.cif.service.SettleInventoryService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.mapper.entity.Condition;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/18.
- */
-@Service
-@Transactional
-public class SettleInventoryServiceImpl extends AbstractService<SettleInventory> implements SettleInventoryService {
-    @Resource
-    private SettleInventoryMapper cSettleInventoryMapper;
-
-    @Override public void deleteByCondition(Condition c) {
-        cSettleInventoryMapper.deleteByCondition(c);
-    }
-}

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.SettlePlanMapper;
-import com.txz.cif.model.SettlePlan;
-import com.txz.cif.service.SettlePlanService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/18.
- */
-@Service
-@Transactional
-public class SettlePlanServiceImpl extends AbstractService<SettlePlan> implements SettlePlanService {
-    @Resource
-    private SettlePlanMapper cSettlePlanMapper;
-
-}

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.SettleMapper;
-import com.txz.cif.model.Settle;
-import com.txz.cif.service.SettleService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-/**
- * Created by CodeGenerator on 2022/11/22.
- */
-@Service
-@Transactional
-public class SettleServiceImpl extends AbstractService<Settle> implements SettleService {
-    @Resource
-    private SettleMapper cSettleMapper;
-
-
-}

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.SysMessageMapper;
-import com.txz.cif.model.SysMessage;
-import com.txz.cif.service.SysMessageService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2023/02/08.
- */
-@Service
-@Transactional
-public class SysMessageServiceImpl extends AbstractService<SysMessage> implements SysMessageService {
-    @Resource
-    private SysMessageMapper cSysMessageMapper;
-
-}

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.SysMessageTemplateMapper;
-import com.txz.cif.model.SysMessageTemplate;
-import com.txz.cif.service.SysMessageTemplateService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2023/02/08.
- */
-@Service
-@Transactional
-public class SysMessageTemplateServiceImpl extends AbstractService<SysMessageTemplate> implements SysMessageTemplateService {
-    @Resource
-    private SysMessageTemplateMapper cSysMessageTemplateMapper;
-
-}

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

@@ -1,22 +0,0 @@
-package com.txz.cif.service.impl;
-
-import com.txz.cif.dao.UserLogMapper;
-import com.txz.cif.model.UserLog;
-import com.txz.cif.service.UserLogService;
-import com.txz.cif.core.AbstractService;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-
-
-/**
- * Created by CodeGenerator on 2022/11/02.
- */
-@Service
-@Transactional
-public class UserLogServiceImpl extends AbstractService<UserLog> implements UserLogService {
-    @Resource
-    private UserLogMapper cUserLogMapper;
-
-}

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

@@ -47,11 +47,6 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
     @Resource
     private UserMapper cUserMapper;
 
-    @Resource
-    private SysMessageService sysMessageService;
-
-    @Resource
-    private SysMessageTemplateService sysMessageTemplateService;
 
     @Resource
     private RedisUtil redisClient;
@@ -60,8 +55,8 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
     private AccountService accountService;
 
 
-    @Resource
-    private OperatorService operatorService;
+//    @Resource
+//    private OperatorService operatorService;
 
     @Resource
     private MessageDubboServiceClient messageDubboServiceClient;
@@ -108,60 +103,60 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
     }
 
     @Override
-    public Result<Object> resetPwd(Long operatorId, String pwd, String newPwd) {
-        Operator operator = operatorService.findById(operatorId);
+    public Result<Object> resetPwd(Long userId, String pwd, String newPwd) {
+        User operator = findById(userId);
         if (operator == null){
             return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
         }
-        if (!StrUtil.equals(SecureUtil.md5(pwd + operator.getSalt()),operator.getLoginPassword())){
+        if (!StrUtil.equals(SecureUtil.md5(pwd + operator.getSalt()),operator.getPwd())){
             return ResultGenerator.genFailResult(ResultCode.UNLOGIN_PWD_ERROR);
         }
-        operatorService.update(Operator.builder().id(operator.getId()).loginPassword(SecureUtil.md5(newPwd + operator.getSalt())).build());
+        update(User.builder().id(operator.getId()).pwd(SecureUtil.md5(newPwd + operator.getSalt())).build());
         return Result.success();
     }
 
     @Override
     public Boolean resetPhoneNo(Long userId, String phoneNo) {
-        User user = findById(userId);
-        Condition c = new Condition(Operator.class);
-        c.createCriteria().andEqualTo("userId",userId)
-                .andEqualTo("loginType",2);
-        List<Operator> operators =  operatorService.findByCondition(c);
-        if (CollUtil.isNotEmpty(operators)){
-            operatorService.update(Operator.builder().id(operators.get(0).getId())
-                    .loginAccount(phoneNo).build());
-        }
-        update(User.builder().id(user.getId()).phoneNo(phoneNo).build());
+//        User user = findById(userId);
+//        Condition c = new Condition(Operator.class);
+//        c.createCriteria().andEqualTo("userId",userId)
+//                .andEqualTo("loginType",2);
+//        List<Operator> operators =  operatorService.findByCondition(c);
+//        if (CollUtil.isNotEmpty(operators)){
+//            operatorService.update(Operator.builder().id(operators.get(0).getId())
+//                    .loginAccount(phoneNo).build());
+//        }
+//        update(User.builder().id(user.getId()).phoneNo(phoneNo).build());
         return true;
     }
 
     @Override
     public Boolean resetLoginAccount(Long userId, String loginAccount) {
         User user = findById(userId);
-        Condition c = new Condition(Operator.class);
-        c.createCriteria().andEqualTo("userId",userId)
-                .andEqualTo("loginType",1);
-        List<Operator> operators =  operatorService.findByCondition(c);
-        if (CollUtil.isNotEmpty(operators)){
-            operatorService.update(Operator.builder().id(operators.get(0).getId())
-                    .loginAccount(loginAccount).build());
-        } else  {
-            String salt = RandomUtil.randomString(4);
-            String pwd = SecureUtil.md5("123456"+salt);
-            Operator operator = Operator.builder().createUser(user.getCreateUser()).createTime(DateUtil.date())
-                    .appCode(user.getAppCode()).userId(user.getId()).updateUser(user.getCreateUser())
-                    .loginAccount(loginAccount)
-                    .loginType(1).salt(salt).loginPassword(pwd).status(1).build();
-            operatorService.save(operator);
-        }
+//        Condition c = new Condition(Operator.class);
+//        c.createCriteria().andEqualTo("userId",userId)
+//                .andEqualTo("loginType",1);
+//        List<Operator> operators =  operatorService.findByCondition(c);
+//        if (CollUtil.isNotEmpty(operators)){
+//            operatorService.update(Operator.builder().id(operators.get(0).getId())
+//                    .loginAccount(loginAccount).build());
+//        } else  {
+//            String salt = RandomUtil.randomString(4);
+//            String pwd = SecureUtil.md5("123456"+salt);
+//            Operator operator = Operator.builder().createUser(user.getCreateUser()).createTime(DateUtil.date())
+//                    .appCode(user.getAppCode()).userId(user.getId()).updateUser(user.getCreateUser())
+//                    .loginAccount(loginAccount)
+//                    .loginType(1).salt(salt).loginPassword(pwd).status(1).build();
+//            operatorService.save(operator);
+//        }
         return true;
     }
 
-    @Override
-    public Boolean resetEmail(Long userId, String email) {
-        update(User.builder().id(userId).email(email).build());
-        return true;
-    }
+//    @Override
+//    public Boolean resetEmail(Long userId, String email) {
+//        update(User.builder().id(userId).email(email).build());
+//        return true;
+//    }
 
     @Override
     public Long createUser(UserAddParam param, String userName,Integer type) {
@@ -170,48 +165,23 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
         user.setCreateTime(today);
         user.setCreateUser(userName);
         user.setStatus((byte)1);
-        user.setWorkStatus((byte)1);
-        user.setType(type);
         user.setVersion("1.0.1");
         String remark = "个人账户（负债类）";
-        user.setAppCode("receiving");
         String  aliases = "202";
-        if (user.getType() ==3){
-            remark = "企业账户（负债类）";
-            user.setAppCode("sponsor");
-            aliases = "203";
-        }if (user.getType() ==1){
-            remark = "企业账户（负债类）";
-            user.setAppCode("receiving");
-            aliases = "204";
-        }
+        String salt = RandomUtil.randomString(4);
+        String pwd = SecureUtil.md5(param.getPassword()+salt);
+        user.setSalt(salt);
+        user.setPwd(pwd);
         //创建资金账户
+        user.setLastLoginTime(DateUtil.date());
+        saveUseGeneratedKeys(user);
         Account account =  Account.builder().balance(BigDecimal.ZERO).beforeDayBalance(BigDecimal.ZERO)
                 .aliases(aliases).subjectType(2).beforeDayInitBalance(BigDecimal.ZERO)
+                .userId(user.getId())
                 .beforeDayTime(today).createTime(today).freezeAmount(BigDecimal.ZERO).name(user.getName())
                 .remark(remark).type(1) .direction("C") .updateTime(today) .build();
         accountService.saveUseGeneratedKeys(account);
-        user.setAccountId(account.getId());
-        user.setPhoneMessage(1);
-        user.setLanguage("简体");
-        user.setEmailMessage(1);
-        user.setInstationMessage(1);
-        user.setLastTime(DateUtil.date());
-        saveUseGeneratedKeys(user);
-        //创建登录操作员
-        String salt = RandomUtil.randomString(4);
-        String pwd = SecureUtil.md5(param.getPassword()+salt);
-        Operator operator = Operator.builder().createUser(userName).createTime(today)
-                .appCode(user.getAppCode()).userId(user.getId()).updateUser(userName)
-                .loginAccount(user.getPhoneNo())
-                .loginType(2).salt(salt).loginPassword(pwd).status(1).build();
-        operatorService.save(operator);
 
-        operator = Operator.builder().createUser(userName).createTime(today)
-                .appCode(user.getAppCode()).userId(user.getId()).updateUser(userName)
-                .loginAccount(param.getLoginAccount())
-                .loginType(1).salt(salt).loginPassword(pwd).status(1).build();
-        operatorService.save(operator);
        return user.getId();
     }
 
@@ -233,7 +203,7 @@ public class UserServiceImpl extends AbstractService<User> implements UserServic
             log.info("[发送消息]失败，用户未找到");
             return false;
         }
-        if (user.getLastTime()!= null && DateUtil.between(user.getLastTime(),DateUtil.date(), DateUnit.MINUTE)<=30
+        if (user.getLastLoginTime()!= null && DateUtil.between(user.getLastLoginTime(),DateUtil.date(), DateUnit.MINUTE)<=30
             && !MessageBizTypeEnum.getActiveByKey(param.getBizType())){
             log.info("[发送消息]未发送，用户处于活跃状态，不发送消息");
             return true;

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

@@ -0,0 +1,22 @@
+package com.txz.cif.service.impl;
+
+import com.txz.cif.dao.WithdrawRecordMapper;
+import com.txz.cif.model.WithdrawRecord;
+import com.txz.cif.service.WithdrawRecordService;
+import com.txz.cif.core.AbstractService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+
+/**
+ * Created by CodeGenerator on 2025/07/15.
+ */
+@Service
+@Transactional
+public class WithdrawRecordServiceImpl extends AbstractService<WithdrawRecord> implements WithdrawRecordService {
+    @Resource
+    private WithdrawRecordMapper cWithdrawRecordMapper;
+
+}

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

@@ -51,76 +51,10 @@ public class AccountApiController extends AbstractApiController {
 	@Resource
 	private AccountService accountService;
 
-//	@Resource
-//	private HospitalService hospitalService;
 
 	@Resource
 	private UserService userService;
 
-//	@Resource
-//	private CaseDubboServiceClient caseDubboServiceClient;
-
-//	@PostMapping("/hospitalSettle")
-//	@ApiOperation(value = "医院端结算",httpMethod = "POST")
-//	public Result<HospitalSettleBO> hospitalSettle(@RequestHeader(value = X_CLIENT_TOKEN_USERID, required = false) Long userId) {
-//		try {
-//			User user = userService.findById(userId);
-//			if (user == null){
-//				return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
-//			}
-//			Account account = accountService.findById(user.getAccountId());
-//			if (account == null){
-//				return ResultGenerator.genFailResult(ResultCode.ACCOUNT_IS_NULL);
-//			}
-//			Hospital hospital = hospitalService.findBy("userId",userId);
-//			if (hospital == null){
-//				return ResultGenerator.genFailResult(ResultCode.HOSPITAL_IS_NULL);
-//			}
-//			HospitalSettleBO bo = new HospitalSettleBO();
-//			bo.setBalance(account.getBalance());
-//			bo.setFreezeAmount(account.getFreezeAmount());
-//			String month = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()),"yyyy-MM-dd");
-//			Map<String,Object> map = new HashMap<>();
-//
-//			map.put("accountId", user.getAccountId());
-//			map.put("startTime", month+" 00:00:00");
-//			map.put("endTime", DateUtil.tomorrow()+" 00:00:00");
-//			//本月交易金额
-//			List<IndexCollectBO> list = accountFlowService.sumAmount(map);
-//			if (CollUtil.isEmpty(list)){
-//				list.add(IndexCollectBO.builder().name(month.substring(0,7)+"支出").num(BigDecimal.ZERO).build());
-//			} else {
-//				for (IndexCollectBO bo1:list ) {
-//					bo1.setName(bo1.getName()+"支出");
-//				}
-//			}
-//
-//			//本月业务数量
-//			Integer num = caseDubboServiceClient.queryIssueCount(hospital.getId(), month + " 00:00:00", DateUtil.tomorrow() + " 00:00:00");
-//			list.add(IndexCollectBO.builder().name(month.substring(0,7)+"发起病例").num(BigDecimal.valueOf(num)).build());
-//			bo.setCollects(list);
-//			map = new HashMap<>();
-//			map.put("accountId", user.getAccountId());
-//			map.put("startTime", DateUtil.format(DateUtil.beginOfYear(DateUtil.date()),"yyyy-MM-dd")+" 00:00:00");
-//			map.put("endTime", DateUtil.tomorrow()+" 00:00:00");
-//			List<IndexCollectBO> list2 = accountFlowService.sumAmount(map);
-//			Map<String,IndexCollectBO> months = getInitMonth();
-//			if (CollUtil.isNotEmpty(list2)){
-//				for (IndexCollectBO bo1:list2) {
-//					months.get(bo1.getName()).setNum(bo1.getNum());
-//				}
-//			}
-//			bo.setOuts(CollUtil.newArrayList(months.values()));
-//			bo.setYear(month.substring(0,4));
-//			bo.setExpenditure(accountFlowService.sumYearExpenditureAmount(user.getAccountId()));
-//			return ResultGenerator.genSuccessResult(bo);
-//		} catch (Exception e) {
-//			log.error("查询对象操作异常e:{}",e);
-//			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-//		}
-//
-//	}
-
 	public static void main(String[] args) {
 		String month = DateUtil.format(DateUtil.beginOfMonth(DateUtil.date()),"yyyy-MM-dd");
 		Date a = DateUtil.beginOfMonth(DateUtil.date());
@@ -147,7 +81,7 @@ public class AccountApiController extends AbstractApiController {
 		}
 		PageHelper.startPage(param.getPage(), param.getSize());
 		Condition c = new Condition(AccountFlow.class);
-		Criteria criteria = c.createCriteria().andEqualTo("accountId",user.getAccountId());
+		Criteria criteria = c.createCriteria().andEqualTo("userId",user.getId());
 		if (param.getType() != null){
 			criteria.andEqualTo("type",param.getType());
 		}

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

@@ -1,132 +0,0 @@
-package com.txz.cif.web;
-import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.txz.cif.core.Result;
-import com.txz.cif.web.bo.MenuBO;
-import com.txz.cif.core.ResultGenerator;
-import com.txz.cif.model.Menu;
-import com.txz.cif.service.MenuService;
-
-import com.txz.cif.core.ResultCode;
-
-import org.apache.commons.lang.StringUtils;
-import org.springframework.web.bind.annotation.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import tk.mybatis.mapper.entity.Condition;
-import tk.mybatis.mapper.entity.Example.Criteria;
-
-import javax.annotation.Resource;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
-* Created by CodeGenerator on 2023/01/05.
-*/
-@Api(tags = "[api]menu管理")
-@RestController
-@RequestMapping("/menu/api")
-public class MenuApiController {
-
-	private static Logger log = LoggerFactory.getLogger(MenuApiController.class);
-
-    @Resource
-    private MenuService menuService;
-
-    @GetMapping("/getMyMenu")
-	@ApiOperation(value = "获取我的菜单（接收端：sourceId为orgId，发起端：sourceId为hospitalId）",httpMethod = "GET")
-    public Result<Menu> detail(@RequestParam Long sourceId, @RequestHeader("appCode") String appCode) {
-    	if(StrUtil.isBlank(appCode)){
-    		return ResultGenerator.genFailResult(ResultCode.APPCODE_IS_NULL);
-    	}
-		Condition c = new Condition(Menu.class);
-		Criteria criteria = c.createCriteria().andEqualTo("appCode",appCode);
-		criteria.andEqualTo("sourceId",sourceId);
-		if(StrUtil.equals(appCode,"receiving")){
-			criteria.andEqualTo("sourceType",2);
-		} else {
-			criteria.andEqualTo("sourceType",3);
-		}
-		c.setOrderByClause("seq");
-    	try {
-    		List<Menu> menus = menuService.findByCondition(c);
-			if (CollUtil.isEmpty(menus)){
-				c = new Condition(Menu.class);
-				criteria = c.createCriteria().andEqualTo("appCode",appCode);
-				criteria.andEqualTo("sourceType",1);
-				c.setOrderByClause("seq");
-				menus = menuService.findByCondition(c);
-			}
-			if (CollUtil.isEmpty(menus)){
-				return ResultGenerator.genSuccessResult(CollUtil.newArrayList());
-			}
-			return ResultGenerator.genSuccessResult(assemblyChildren(menus.stream().map(temp -> BeanUtil.toBean(temp, MenuBO.class)).collect(Collectors.toList())));
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-
-    }
-
-	/**
-	 * 组装资源组
-	 *
-	 * @param rs
-	 * @return
-	 */
-	private static List<MenuBO> assemblyChildren(List<MenuBO> rs) {
-		if (rs == null) {
-			return null;
-		}
-		//权限的集合对象   对象里面有权限的子权限(孩子节点)
-		List<MenuBO> temp = new LinkedList<MenuBO>();
-		temp.addAll(rs);
-
-
-		List<MenuBO> ret = new LinkedList<MenuBO>();
-		// 组装一个map
-		//把ID为k  每个权限对象 组装为map
-		Map<String, MenuBO> tempMap = new LinkedHashMap<String, MenuBO>();
-		for (MenuBO r : temp) {
-			tempMap.put(r.getId() + "", r);
-		}
-
-		//组装子父权限集合
-		for (MenuBO r : temp) {
-			//判断是否有父节点
-			if (StringUtils.isNotBlank(r.getParentId())) {
-				//取出当前对象的父节点对象
-				MenuBO parent = tempMap.get(r.getParentId());
-				//判断不为空
-				if (parent != null) {
-					//取出对象中子节点集合
-					List<MenuBO> children = parent.getChildren();
-
-					//LIst等于空   就创建一个有序集合
-					if (children == null) {
-						children = new LinkedList<MenuBO>();
-					}
-					//在集合添加此对象ID
-					children.add(tempMap.get(r.getId() + ""));
-					parent.setChildren(children);
-				}
-			}
-		}
-		//组装最大的父权限
-		//判断权限集合每个对象是否有父节点
-		for (MenuBO r : temp) {
-			if (StringUtils.isBlank(r.getParentId())) {
-				ret.add(tempMap.get(r.getId() + ""));
-			}
-		}
-		return ret;
-	}
-
-}

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

@@ -0,0 +1,138 @@
+package com.txz.cif.web;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.generator.SnowflakeGenerator;
+import cn.hutool.core.util.IdUtil;
+import com.txz.cif.core.AuthService;
+import com.txz.cif.core.Result;
+import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.Goods;
+import com.txz.cif.model.RechargeRecord;
+import com.txz.cif.model.User;
+import com.txz.cif.service.GoodsService;
+import com.txz.cif.service.RechargeRecordService;
+
+import com.txz.cif.core.ResultCode;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.txz.cif.service.SequenceService;
+import com.txz.cif.service.UserService;
+import org.springframework.web.bind.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.txz.core.ServiceException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import tk.mybatis.mapper.entity.Condition;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+/**
+* Created by CodeGenerator on 2025/07/15.
+*/
+@Api(tags = "[api]充值记录")
+@RestController
+@RequestMapping("/api/recharge/record")
+public class RechargeRecordApiController {
+
+	private static Logger log = LoggerFactory.getLogger(RechargeRecordApiController.class);
+
+    @Resource
+    private RechargeRecordService rechargeRecordService;
+
+	@Resource
+	private GoodsService goodsService;
+
+	@Resource
+	private AuthService authService;
+
+	@Resource
+	private UserService userService;
+
+	@Resource
+	private SequenceService sequenceService;
+
+	@PostMapping("/add")
+	@ApiOperation(value = "创建充值订单",httpMethod = "POST")
+    public Result add(@RequestParam Long goodsId, HttpServletRequest request) {
+    	if(goodsId == null){
+    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    	}
+    	try {
+			Goods goods = goodsService.findById(goodsId);
+			if (goods == null){
+				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+			}
+			if (goods.getStatus() != 1){
+				return ResultGenerator.genFailResult(ResultCode.STATUS_IS_NULL);
+			}
+			Long userId = authService.getTokenUserId(request);
+			User user = userService.findById(userId);
+			if (user == null){
+				return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+			}
+//			long id = IdUtil.getSnowflake(1, 1).nextId();
+			String orderNo = sequenceService.genSerialNumber("recharge_rule",null);
+			RechargeRecord rechargeRecord = RechargeRecord.builder()
+					.discount(goods.getDiscount())
+					.amount(goods.getAmount())
+					.currency("BDT").userId(userId)
+					.userName(user.getName()).userPhone(user.getPhoneNo())
+					.orderNo(orderNo).goodsId(goodsId)
+					.status(1).createTime(DateUtil.date())
+					.build();
+			//TODO 发起第三方支付
+    		rechargeRecordService.save(rechargeRecord);
+			return ResultGenerator.genSuccessResult(rechargeRecord);
+		} catch (Exception e) {
+			log.error("新增对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+    }
+
+
+
+    @GetMapping("/detail")
+	@ApiOperation(value = "rechargeRecord获取详情",httpMethod = "GET")
+    public Result<RechargeRecord> detail(@RequestParam Integer id) {
+    	if(id == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+
+    	RechargeRecord rechargeRecord = null;
+    	try {
+    		rechargeRecord = rechargeRecordService.findById(id);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+        return ResultGenerator.genSuccessResult(rechargeRecord);
+    }
+
+    @PostMapping("/list")
+	@ApiOperation(value = "rechargeRecord获取列表",httpMethod = "POST")
+    public Result<List<RechargeRecord>> list(@RequestBody RechargeRecord rechargeRecord, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(rechargeRecord.getClass());
+        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+		PageInfo pageInfo = null;
+		try {
+    		 List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
+    		 pageInfo = new PageInfo(list);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+}

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

@@ -1,109 +0,0 @@
-package com.txz.cif.web;
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import com.txz.cif.core.AbstractApiController;
-import com.txz.cif.core.Result;
-import com.txz.cif.web.bo.SysMessageBO;
-import com.txz.cif.web.para.MessageReadParam;
-import com.txz.cif.core.ResultGenerator;
-import com.txz.cif.model.SysMessage;
-import com.txz.cif.service.SysMessageService;
-
-import com.txz.cif.core.ResultCode;
-
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import org.springframework.web.bind.annotation.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import tk.mybatis.mapper.entity.Condition;
-import tk.mybatis.mapper.entity.Example.Criteria;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
-* Created by CodeGenerator on 2023/02/08.
-*/
-@Api(tags = "[api]系统消息管理")
-@RestController
-@RequestMapping("/sys/message/api")
-public class SysMessageApiController extends AbstractApiController {
-
-	private static Logger log = LoggerFactory.getLogger(SysMessageApiController.class);
-
-    @Resource
-    private SysMessageService sysMessageService;
-
-
-    @PostMapping("/read")
-	@ApiOperation(value = "读消息",httpMethod = "POST")
-    public Result update(@RequestBody MessageReadParam param) {
-    	if(param == null){
-    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-    	}
-		if(CollUtil.isEmpty(param.getIds())){
-			return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
-		}
-
-    	try {
-			for (Long id:param.getIds()) {
-				SysMessage sysMessage = sysMessageService.findById(id);
-				if (sysMessage == null){
-					continue;
-				}
-				if (sysMessage.getStatus() == 2){
-					continue;
-				}
-				sysMessageService.update(SysMessage.builder().id(id).status(2).readTime(DateUtil.date()).build());
-			}
-		} catch (Exception e) {
-			log.error("更新对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return ResultGenerator.genSuccessResult();
-    }
-
-    @GetMapping("/detail")
-	@ApiOperation(value = "获取详情",httpMethod = "GET")
-    public Result<SysMessageBO> detail(@RequestParam Integer id) {
-    	if(id == null){
-    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
-    	}
-    	SysMessage sysMessage = null;
-    	try {
-    		sysMessage = sysMessageService.findById(id);
-			if (sysMessage == null){
-				return ResultGenerator.genSuccessResult();
-			}
-			return ResultGenerator.genSuccessResult(sysMessage.generator());
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-    }
-
-    @GetMapping("/list")
-	@ApiOperation(value = "sysMessage获取列表",httpMethod = "GET")
-    public Result<List<SysMessageBO>> list(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, @RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId ) {
-        PageHelper.startPage(page, size);
-        Condition condition = new Condition(SysMessage.class);
-        Criteria criteria = condition.createCriteria();
-        criteria.andEqualTo("userId", userId);
-		PageInfo pageInfo = null;
-		try {
-			condition.setOrderByClause("create_time desc");
-    		 List<SysMessage> list = sysMessageService.findByCondition(condition);
-    		 pageInfo = new PageInfo(list);
-			pageInfo.setList(list.stream().map(SysMessage::generator).collect(Collectors.toList()));
-		} catch (Exception e) {
-			log.error("查询对象操作异常e:{}",e);
-			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
-		}
-        return ResultGenerator.genSuccessResult(pageInfo);
-    }
-}

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

@@ -1,134 +0,0 @@
-//package com.txz.cif.web;
-//
-//import cn.hutool.core.collection.CollUtil;
-//import cn.hutool.core.date.DateUtil;
-//import cn.hutool.core.io.FileTypeUtil;
-//import cn.hutool.core.util.StrUtil;
-//import com.txz.cif.configurer.Parameters;
-//import com.txz.cif.core.Result;
-//import com.txz.cif.core.ResultGenerator;
-//import com.txz.cif.web.bo.FileBo;
-//import io.minio.*;
-//import io.minio.errors.MinioException;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.web.bind.annotation.*;
-//import org.springframework.web.multipart.MultipartFile;
-//
-//import javax.annotation.Resource;
-//import javax.servlet.http.HttpServletResponse;
-//import java.io.*;
-//import java.net.URLEncoder;
-//import java.security.InvalidKeyException;
-//import java.security.NoSuchAlgorithmException;
-//import java.util.Date;
-//import java.util.List;
-//
-///**
-// * @Author: linxk
-// * @Date: 2020/1/2 9:48
-// * @Version 1.0
-// */
-//@Api(tags = "[api]上传公共资源")
-//@RestController
-//@RequestMapping("upload")
-//@Slf4j
-//public class UploadController {
-//
-//    @Resource
-//    private MinioClient minioClient;
-//
-//    @Resource
-//    private Parameters parameters;
-//
-//    private static final String FILE_NAME_PATTERN = "{}_{}";
-//
-//
-//    @ApiOperation(value = "上传公共资源", notes = "",httpMethod = "POST")
-//    @PostMapping("/upload")
-//    public Result upload(MultipartFile file) {
-//
-//        try {
-//            // 上传文件的原始文件名
-//            String originalFilename = file.getOriginalFilename();
-//            // 文件大小
-//            long fileSize = file.getSize();
-//
-//            log.info("上传文件的原始文件名：{}，文件大小：{}", originalFilename, fileSize);
-//            // 文件名：日期_原始文件名
-//
-//
-//            String imageType = FileTypeUtil.getType(file.getInputStream());
-//            List<String> types = CollUtil.newArrayList("jpg","png","gif","tif","bmp","jpeg","webp");
-//            Boolean isPic = false;
-//            if (types.contains(imageType)){
-//                isPic = true;
-//            }
-//            String fileName = parameters.getApplication()+"/"+ DateUtil.format(new Date(), "yyyyMMddHHmmss")+"."+imageType;
-//            log.info("格式化后的文件名：{}", fileName);
-//            ObjectWriteResponse response = minioClient.putObject(PutObjectArgs.builder().bucket(parameters.getBucketName())
-//                    .object(fileName).stream(file.getInputStream(), fileSize, -1).contentType(file.getContentType()).build());
-//            FileBo fileBo = FileBo.builder().fileName(fileName).size(fileSize).imageType(imageType).isPic(isPic)
-//                    .url(parameters.getBaseUrl() +"/cif/upload/download?bucket="+parameters.getBucketName()+"&filename="+fileName)
-//                    .build();
-//            return ResultGenerator.genSuccessResult( fileBo);
-//        } catch (Exception e) {
-//            log.info("上传文件失败！", e);
-//            return ResultGenerator.genFailResult("上传失败！请选择有效文件");
-//        }
-//
-//    }
-//
-//    @ApiOperation(value = "下载文件", notes = "",httpMethod = "GET")
-//    @GetMapping("/download")
-//    public void download(@RequestParam String filename,@RequestParam String bucket, HttpServletResponse httpResponse){
-//        downloadImg(filename,bucket,httpResponse);
-//    }
-//
-//    public void downloadImg(String filename,String imgBucket, HttpServletResponse httpResponse) {
-//        try{
-//            if (StrUtil.isBlank(imgBucket)){
-//                return;
-//            }
-//            //imgBucket--桶名称  filename-- 图片名称
-//            GetObjectArgs getObjectArgs = GetObjectArgs.builder().bucket(imgBucket).object(filename).build();
-//            StatObjectArgs args = StatObjectArgs.builder().bucket(imgBucket).object(filename).build();
-//            InputStream files = minioClient.getObject(getObjectArgs);
-//            InputStream ism = new BufferedInputStream(files);
-//            // 调用statObject()来判断对象是否存在。
-//            // 如果不存在, statObject()抛出异常,
-//            // 否则则代表对象存在
-//            minioClient.statObject(args);
-//            byte buf[] = new byte[1024];
-//            int length = 0;
-//            httpResponse.reset();
-//            //Content-disposition 是 MIME 协议的扩展，MIME 协议指示 MIME 用户代理如何显示附加的文件。
-//            // Content-disposition其实可以控制用户请求所得的内容存为一个文件的时候提供一个默认的文件名，
-//            // 文件直接在浏览器上显示或者在访问时弹出文件下载对话框。
-//            httpResponse.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
-//            httpResponse.setContentType("application/x-msdownload");
-//            httpResponse.setCharacterEncoding("utf-8");
-//            OutputStream osm = new BufferedOutputStream(httpResponse.getOutputStream());
-//            while ((length = ism.read(buf))>0) {
-//                osm.write(buf,0, length);
-//            }
-//            //关闭流
-//            osm.close();
-//        } catch (MinioException ex) {
-//            ex.printStackTrace();
-//        }  catch (NoSuchAlgorithmException e) {
-//            e.printStackTrace();
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        } catch (InvalidKeyException e) {
-//            e.printStackTrace();
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//
-//    }
-//
-//
-//
-//}

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

@@ -7,12 +7,16 @@ import javax.servlet.http.HttpServletRequest;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
 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.util.IpUtils;
 import com.txz.cif.web.bo.UserBo;
 import com.txz.cif.web.bo.UserInfoBO;
 import com.txz.cif.web.para.LoginAccountParameters;
+import com.txz.cif.web.para.MyUserParam;
 import com.txz.cif.web.para.UserInfoForm;
 import com.txz.cif.core.*;
 import com.txz.cif.model.*;
@@ -22,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import lombok.extern.slf4j.Slf4j;
 import tk.mybatis.mapper.entity.Condition;
+import tk.mybatis.mapper.entity.Example;
 
 @RestController
 @RequestMapping(value = "/api/user")
@@ -35,22 +40,19 @@ public class UserApiController extends AbstractApiController {
     @Resource
     private UserService userService;
 
-    @Resource
-    private OperatorService operatorService;
-
     @Resource
     private AuthService authService;
 
+
     @Resource
-    private UserLogService userLogService;
+    private ConfigMemberService configMemberService;
 
 
 
-    @ApiOperation(value = "用户登陆 appCode（发起端：sponsor，接收端：receiving）", notes = "",httpMethod = "POST")
+    @ApiOperation(value = "用户登陆", notes = "",httpMethod = "POST")
     @PostMapping("/login")
     public Result<UserBo> login(@RequestBody LoginAccountParameters loginPara ,
                                 @RequestHeader(value = "version",defaultValue = "1.0.1") String version ,
-                                @RequestHeader("appCode") String appCode,
                                 HttpServletRequest request) {
         if (StrUtil.isBlank(loginPara.getAccount())){
             return ResultGenerator.genFailResult(ResultCode.ACCOUNT_IS_NULL);
@@ -59,24 +61,20 @@ public class UserApiController extends AbstractApiController {
             return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
         }
         try {
-            Condition condition = new Condition(Operator.class);
-            condition.createCriteria().andEqualTo("loginAccount", loginPara.getAccount())
-                    .andEqualTo("appCode",appCode);
-            List<Operator> operators = operatorService.findByCondition(condition);
-            Operator operator = null;
+            Condition condition = new Condition(User.class);
+            condition.createCriteria().andEqualTo("phoneNo", loginPara.getAccount());
+            List<User> operators = userService.findByCondition(condition);
             User user = null;
             if (CollUtil.isEmpty(operators)) {
                 return ResultGenerator.genFailResult(ResultCode.OPERATOR_IS_NULL);
             } else if (operators.size() != 1) {
                 return ResultGenerator.genFailResult(ResultCode.OPERATOR_IS_ERROR);
             } else {
-                operator = operators.get(0);
+                user = operators.get(0);
             }
-            String pwd2 = SecureUtil.md5(loginPara.getPwd() + operator.getSalt());
+            String pwd2 = SecureUtil.md5(loginPara.getPwd() + user.getSalt());
             log.info("用户："+loginPara.getAccount()+"登录密码："+loginPara.getPwd() +"加密后："+pwd2);
-            if (StringUtils.equals(operator.getLoginPassword(), pwd2)) {
-                operator = setOperatorToken(operator, 30,operator.getUserId());
-                user = userService.findById(operator.getUserId());
+            if (StringUtils.equals(user.getPwd(), pwd2)) {
                 if (user == null) {
                     return ResultGenerator.genFailResult(ResultCode.USER_IS_NULL);
                 }
@@ -87,12 +85,9 @@ public class UserApiController extends AbstractApiController {
                 return ResultGenerator.genFailResult(ResultCode.UNLOGIN_PWD_ERROR);
             }
 
-            Long hospitalId = null;
-            userLogService.save(UserLog.builder().bizId(user.getId()).createTime(DateUtil.date())
-                    .ip(IpUtils.getIPAddress(request)).type(1).version(version).build());
-            return ResultGenerator.genSuccessResult(UserBo.builder().token(operator.getLastToken())
-                            .userId(user.getId()).icon(user.getIcon()).name(user.getName())
-                            .sseId(SecureUtil.md5("sse"+user.getId())).hospitalId(hospitalId).build());
+            return ResultGenerator.genSuccessResult(UserBo.builder().token(user.getLastToken())
+                            .userId(user.getId()).icon(user.getHeadPic()).name(user.getName())
+                            .sseId(SecureUtil.md5("sse"+user.getId())).build());
         } catch (Exception e){
             log.error("登录异常：",e);
             return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
@@ -100,13 +95,13 @@ public class UserApiController extends AbstractApiController {
 
     }
 
-    @ApiOperation(value = "获取游客Token", notes = "",httpMethod = "GET")
-    @GetMapping("/getSightseerToken")
-    public Result<String> getSightseerToken(@RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId,
-                                            @RequestHeader(value = X_CLIENT_TOKEN_OPERATORID,required = false) Long operatorId) {
-        String token = authService.buildJwtTokenWithRole(operatorId, userId, 1, 1);
-        return ResultGenerator.genSuccessResult(token);
-    }
+//    @ApiOperation(value = "获取游客Token", notes = "",httpMethod = "GET")
+//    @GetMapping("/getSightseerToken")
+//    public Result<String> getSightseerToken(@RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId,
+//                                            @RequestHeader(value = X_CLIENT_TOKEN_OPERATORID,required = false) Long operatorId) {
+//        String token = authService.buildJwtTokenWithRole(operatorId, userId, 1, 1);
+//        return ResultGenerator.genSuccessResult(token);
+//    }
 
     @ApiOperation(value = "获取Token内的参数", notes = "",httpMethod = "GET")
     @GetMapping("/getTokenParam")
@@ -120,23 +115,21 @@ public class UserApiController extends AbstractApiController {
      * @param operator
      * @return
      */
-    private Operator setOperatorToken(Operator operator, Integer dateTime,Long userId) {
+    private User setOperatorToken(User operator, Integer dateTime,Long userId) {
         // 删掉之前的老token
         String lastToken = operator.getLastToken();
         if (StrUtil.isNotEmpty(lastToken)) {
             redisUtil.del(lastToken);
         }
-        String token = authService.buildJwtToken(operator.getId(), userId);
-//        CacheKey key = CacheKey.generateKey(CacheType.UserToken, operator.getId().toString());
-        //设置redis缓存1小时
+        String token = authService.buildJwtToken( userId);
+    //设置redis缓存1小时
         if (dateTime == null) {
             dateTime = 7;
         }
-//        redisUtil.set(key.toString(), operator.getId(), dateTime, TimeUnit.DAYS);
-        operator.setLoginPassword("***");
+        operator.setPwd("***");
         operator.setSalt("***");
         operator.setLastToken(token);
-        operatorService.update(Operator.builder().id(operator.getId()).lastToken(token).lastLoginTime(
+        userService.update(User.builder().id(operator.getId()).lastToken(token).lastLoginTime(
                 DateUtil.date()).build());
         return operator;
     }
@@ -172,9 +165,6 @@ public class UserApiController extends AbstractApiController {
         if (StrUtil.isNotBlank(userForm.getPhoneNo())){
             userService.resetPhoneNo(userId,userForm.getPhoneNo());
         }
-        if (StrUtil.isNotBlank(userForm.getEmail())){
-            userService.resetEmail(userId,userForm.getEmail());
-        }
 
         return ResultGenerator.genSuccessResult(user.generator());
     }
@@ -188,11 +178,10 @@ public class UserApiController extends AbstractApiController {
     @ApiOperation(value = "通过旧密码设置密码", notes = "",httpMethod = "GET")
     @GetMapping("/resetPwd")
     public Result<Object> resetPwd(@RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId,
-                                   @RequestHeader(value = X_CLIENT_TOKEN_OPERATORID,required = false) Long operatorId,
                                    @RequestParam("pwd") String pwd,
                                    @RequestParam("newPwd") String newPwd
                                    ) {
-        return userService.resetPwd(operatorId,pwd,newPwd);
+        return userService.resetPwd(userId,pwd,newPwd);
     }
 
 //    /**
@@ -287,4 +276,45 @@ public class UserApiController extends AbstractApiController {
 //                                   ) {
 //        return userService.resetPwd(userId,pwd,code);
 //    }
+
+    @PostMapping("/myUsers")
+    @ApiOperation(value = "获取我的邀请的用户",httpMethod = "POST")
+    public Result<List<User>> myUsers(@RequestBody MyUserParam param, HttpServletRequest request, @RequestHeader(value = X_CLIENT_TOKEN_USERID,required = false) Long userId) {
+        PageHelper.startPage(param.getPage(), param.getSize());
+        Condition condition = new Condition(User.class);
+        Example.Criteria criteria = condition.createCriteria();
+        if (param.getType() == 1){
+            criteria.andEqualTo("pid",userId);
+        } else {
+            criteria.andEqualTo("ppid",userId);
+        }
+        if (StrUtil.isNotBlank(param.getName())) {
+            criteria.andLike("name", "%" + param.getName() + "%");
+        }
+        if (StrUtil.isNotBlank(param.getPhone())) {
+            criteria.andEqualTo("phoneNo", param.getPhone());
+        }
+        if (StrUtil.isNotBlank(param.getStartTime())) {
+            criteria.andGreaterThanOrEqualTo("createTime", param.getStartTime());
+        }
+        if (StrUtil.isNotBlank(param.getEndTime())) {
+            criteria.andLessThanOrEqualTo("createTime", param.getEndTime());
+        }
+
+        PageInfo pageInfo = null;
+        try {
+            List<User> list = userService.findByCondition(condition);
+            for (User user2 : list) {
+                user2.setPwd("******");
+                user2.setSalt("***");
+            }
+            pageInfo = new PageInfo(list);
+        } catch (Exception e) {
+            log.error("查询对象操作异常e:{}", e);
+            return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+        }
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+
+
 }

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

@@ -1,58 +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 javax.persistence.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="系统消息")
-public class SysMessageBO {
-    @ApiModelProperty(value="id")
-    private Long messageId;
-
-    /**
-     * 用户id
-     */
-    @ApiModelProperty(value="userId用户id")
-    private Long userId;
-
-
-    /**
-     * 发送用户id
-     */
-    @ApiModelProperty(value="sendUserId发送用户id")
-    private String sendUserId;
-
-    /**
-     * 业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算
-     */
-    @ApiModelProperty(value="bizType业务类型 1收到新病例 2收到新冰冻病例  3处理中的病例信息更新 4处理中的病例收到发起端新的消息留言 5月账单结算")
-    private Integer bizType;
-
-    /**
-     * 内容
-     */
-    @ApiModelProperty(value="content内容")
-    private String content;
-
-    /**
-     * 状态 1未读 2已读
-     */
-    @ApiModelProperty(value="status状态 1未读 2已读")
-    private Integer status;
-
-    /**
-     * 创建时间
-     */
-    @ApiModelProperty(value="createTime创建时间")
-    private Date createTime;
-
-
-}

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

@@ -32,9 +32,6 @@ public class UserBo {
     @ApiModelProperty(value="token")
     private String token;
 
-    @ApiModelProperty(value="医院id（发起端才会有值）")
-    private Long hospitalId;
-
     @ApiModelProperty(value="站内信id")
     private String sseId;
 

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

@@ -1,9 +1,13 @@
 package com.txz.cif.web.bo;
 
+import com.txz.cif.model.ConfigMember;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 @Getter
 @Setter
 @NoArgsConstructor
@@ -43,36 +47,11 @@ public class UserInfoBO {
     @ApiModelProperty(value="status状态 0未启用 1正常 2禁用 3停用 4锁定")
     private Byte status;
 
-    /**
-     * 工作状态 1空闲 2不接诊
-     */
-    @ApiModelProperty(value="workStatus工作状态 1空闲 2不接诊")
-    private Byte workStatus;
-
-    @ApiModelProperty(value="所属系统多个使用，分割")
-    private String sysTypes;
 
-    /**
-     * 电话
-     */
     @ApiModelProperty(value="phoneNo电话")
     private String phoneNo;
 
-    @ApiModelProperty(value="电话消息 1接收 2不接收")
-    private Integer phoneMessage;
-
-
-    /**
-     * 邮箱
-     */
-    @ApiModelProperty(value="email邮箱")
-    private String email;
-
-    @ApiModelProperty(value="邮箱消息 1接收 2不接收")
-    private Integer emailMessage;
 
-    @ApiModelProperty(value="站内消息 1接收 2不接收")
-    private Integer instationMessage;
 
     @ApiModelProperty(value="语言")
     private String  language;
@@ -115,21 +94,26 @@ public class UserInfoBO {
     @ApiModelProperty(value="areaCode所属区域代码")
     private String areaCode;
 
-    /**
-     * 简介
-     */
-    @ApiModelProperty(value="简介")
-    private String introductory;
-
-    @ApiModelProperty(value="签名地址")
-    private String signUrl;
-
     @ApiModelProperty(value="站内信id")
     private String sseId;
 
-    @ApiModelProperty("状态 1是 2否 ")
-    private Integer isHospital;
+    @ApiModelProperty(value="会员等级配置")
+    private  List<ConfigMember> memberLevels;
+
+    @ApiModelProperty(value="会员等级配置")
+    private Integer level;
+
+    @ApiModelProperty(value="当前邀请人数")
+    private Integer invitedNo;
+
+    @ApiModelProperty(value="下级邀请人数")
+    private Integer nextInvitedNo;
+
+    @ApiModelProperty(value="团队人数")
+    private Integer teamNo;
+
+    @ApiModelProperty(value="7日收益")
+    private BigDecimal L7DEarnings;
+
 
-    @ApiModelProperty("是否是本地图片 1是 2否 ")
-    private Integer isLocal;
 }

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

@@ -0,0 +1,128 @@
+package com.txz.cif.web.mng;
+import com.txz.cif.core.Result;
+import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.ConfigMember;
+import com.txz.cif.service.ConfigMemberService;
+
+import com.txz.cif.core.ResultCode;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.web.bind.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.txz.core.ServiceException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import tk.mybatis.mapper.entity.Condition;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+import javax.annotation.Resource;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+/**
+* Created by CodeGenerator on 2025/07/15.
+*/
+@Api(tags = "[后台]configMember管理")
+@RestController
+@RequestMapping("/config/member")
+public class ConfigMemberController {
+
+	private static Logger log = LoggerFactory.getLogger(ConfigMemberController.class);
+
+    @Resource
+    private ConfigMemberService configMemberService;
+
+    @PostMapping("/add")
+	@ApiOperation(value = "configMember新增",httpMethod = "POST")
+    public Result add(@RequestBody ConfigMember configMember) {
+    	if(configMember == null){
+    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    	}
+    	try {
+    //		configMember.setCreateTime(new Date());
+    //		configMember.setCreateUserId(userId);
+    		configMemberService.save(configMember);
+		} catch (Exception e) {
+			log.error("新增对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+        return ResultGenerator.genSuccessResult(configMember);
+    }
+
+    @GetMapping("/delete")
+	@ApiOperation(value = "configMember删除",httpMethod = "GET")
+    public Result delete(@RequestParam Integer id) {
+    	if(id == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+    	try {
+    		configMemberService.deleteById(id);
+		} catch (Exception e) {
+			log.error("删除对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/update")
+	@ApiOperation(value = "configMember更新",httpMethod = "POST")
+    public Result update(@RequestBody ConfigMember configMember) {
+    	if(configMember == null){
+    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    	}
+    	if(configMember.getId() == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+    	try {
+    //		configMember.setUpdateTime(new Date());
+    //		configMember.setUpdateUserId(userId);
+    		configMemberService.update(configMember);
+		} catch (Exception e) {
+			log.error("更新对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/detail")
+	@ApiOperation(value = "configMember获取详情",httpMethod = "GET")
+    public Result<ConfigMember> detail(@RequestParam Integer id) {
+    	if(id == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+
+    	ConfigMember configMember = null;
+    	try {
+    		configMember = configMemberService.findById(id);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+        return ResultGenerator.genSuccessResult(configMember);
+    }
+
+    @PostMapping("/list")
+	@ApiOperation(value = "configMember获取列表",httpMethod = "POST")
+    public Result<List<ConfigMember>> list(@RequestBody ConfigMember configMember, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(configMember.getClass());
+        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+		PageInfo pageInfo = null;
+		try {
+    		 List<ConfigMember> list = configMemberService.findByCondition(condition);
+    		 pageInfo = new PageInfo(list);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+}

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

@@ -0,0 +1,128 @@
+package com.txz.cif.web.mng;
+import com.txz.cif.core.Result;
+import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.RechargeRecord;
+import com.txz.cif.service.RechargeRecordService;
+
+import com.txz.cif.core.ResultCode;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.web.bind.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.txz.core.ServiceException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import tk.mybatis.mapper.entity.Condition;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+import javax.annotation.Resource;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+/**
+* Created by CodeGenerator on 2025/07/15.
+*/
+@Api(tags = "[后台]rechargeRecord管理")
+@RestController
+@RequestMapping("/recharge/record")
+public class RechargeRecordController {
+
+	private static Logger log = LoggerFactory.getLogger(RechargeRecordController.class);
+
+    @Resource
+    private RechargeRecordService rechargeRecordService;
+
+    @PostMapping("/add")
+	@ApiOperation(value = "rechargeRecord新增",httpMethod = "POST")
+    public Result add(@RequestBody RechargeRecord rechargeRecord) {
+    	if(rechargeRecord == null){
+    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    	}
+    	try {
+    //		rechargeRecord.setCreateTime(new Date());
+    //		rechargeRecord.setCreateUserId(userId);
+    		rechargeRecordService.save(rechargeRecord);
+		} catch (Exception e) {
+			log.error("新增对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+        return ResultGenerator.genSuccessResult(rechargeRecord);
+    }
+
+    @GetMapping("/delete")
+	@ApiOperation(value = "rechargeRecord删除",httpMethod = "GET")
+    public Result delete(@RequestParam Integer id) {
+    	if(id == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+    	try {
+    		rechargeRecordService.deleteById(id);
+		} catch (Exception e) {
+			log.error("删除对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/update")
+	@ApiOperation(value = "rechargeRecord更新",httpMethod = "POST")
+    public Result update(@RequestBody RechargeRecord rechargeRecord) {
+    	if(rechargeRecord == null){
+    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    	}
+    	if(rechargeRecord.getId() == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+    	try {
+    //		rechargeRecord.setUpdateTime(new Date());
+    //		rechargeRecord.setUpdateUserId(userId);
+    		rechargeRecordService.update(rechargeRecord);
+		} catch (Exception e) {
+			log.error("更新对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/detail")
+	@ApiOperation(value = "rechargeRecord获取详情",httpMethod = "GET")
+    public Result<RechargeRecord> detail(@RequestParam Integer id) {
+    	if(id == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+
+    	RechargeRecord rechargeRecord = null;
+    	try {
+    		rechargeRecord = rechargeRecordService.findById(id);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+        return ResultGenerator.genSuccessResult(rechargeRecord);
+    }
+
+    @PostMapping("/list")
+	@ApiOperation(value = "rechargeRecord获取列表",httpMethod = "POST")
+    public Result<List<RechargeRecord>> list(@RequestBody RechargeRecord rechargeRecord, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(rechargeRecord.getClass());
+        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+		PageInfo pageInfo = null;
+		try {
+    		 List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
+    		 pageInfo = new PageInfo(list);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+}

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

@@ -0,0 +1,128 @@
+package com.txz.cif.web.mng;
+import com.txz.cif.core.Result;
+import com.txz.cif.core.ResultGenerator;
+import com.txz.cif.model.WithdrawRecord;
+import com.txz.cif.service.WithdrawRecordService;
+
+import com.txz.cif.core.ResultCode;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.web.bind.annotation.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.txz.core.ServiceException;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import tk.mybatis.mapper.entity.Condition;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
+import javax.annotation.Resource;
+import java.util.List;
+import org.apache.commons.lang.StringUtils;
+
+/**
+* Created by CodeGenerator on 2025/07/15.
+*/
+@Api(tags = "[后台]withdrawRecord管理")
+@RestController
+@RequestMapping("/withdraw/record")
+public class WithdrawRecordController {
+
+	private static Logger log = LoggerFactory.getLogger(WithdrawRecordController.class);
+
+    @Resource
+    private WithdrawRecordService withdrawRecordService;
+
+    @PostMapping("/add")
+	@ApiOperation(value = "withdrawRecord新增",httpMethod = "POST")
+    public Result add(@RequestBody WithdrawRecord withdrawRecord) {
+    	if(withdrawRecord == null){
+    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    	}
+    	try {
+    //		withdrawRecord.setCreateTime(new Date());
+    //		withdrawRecord.setCreateUserId(userId);
+    		withdrawRecordService.save(withdrawRecord);
+		} catch (Exception e) {
+			log.error("新增对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+        return ResultGenerator.genSuccessResult(withdrawRecord);
+    }
+
+    @GetMapping("/delete")
+	@ApiOperation(value = "withdrawRecord删除",httpMethod = "GET")
+    public Result delete(@RequestParam Integer id) {
+    	if(id == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+    	try {
+    		withdrawRecordService.deleteById(id);
+		} catch (Exception e) {
+			log.error("删除对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @PostMapping("/update")
+	@ApiOperation(value = "withdrawRecord更新",httpMethod = "POST")
+    public Result update(@RequestBody WithdrawRecord withdrawRecord) {
+    	if(withdrawRecord == null){
+    		return ResultGenerator.genFailResult(ResultCode.OBJECT_IS_NULL);
+    	}
+    	if(withdrawRecord.getId() == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+    	try {
+    //		withdrawRecord.setUpdateTime(new Date());
+    //		withdrawRecord.setUpdateUserId(userId);
+    		withdrawRecordService.update(withdrawRecord);
+		} catch (Exception e) {
+			log.error("更新对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult();
+    }
+
+    @GetMapping("/detail")
+	@ApiOperation(value = "withdrawRecord获取详情",httpMethod = "GET")
+    public Result<WithdrawRecord> detail(@RequestParam Integer id) {
+    	if(id == null){
+    		return ResultGenerator.genFailResult(ResultCode.ID_IS_NULL);
+    	}
+
+    	WithdrawRecord withdrawRecord = null;
+    	try {
+    		withdrawRecord = withdrawRecordService.findById(id);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+
+        return ResultGenerator.genSuccessResult(withdrawRecord);
+    }
+
+    @PostMapping("/list")
+	@ApiOperation(value = "withdrawRecord获取列表",httpMethod = "POST")
+    public Result<List<WithdrawRecord>> list(@RequestBody WithdrawRecord withdrawRecord, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+
+        PageHelper.startPage(page, size);
+
+        Condition condition = new Condition(withdrawRecord.getClass());
+        Criteria criteria = condition.createCriteria();
+//        criteria.andEqualTo("name", city.getName());
+		PageInfo pageInfo = null;
+		try {
+    		 List<WithdrawRecord> list = withdrawRecordService.findByCondition(condition);
+    		 pageInfo = new PageInfo(list);
+		} catch (Exception e) {
+			log.error("查询对象操作异常e:{}",e);
+			return ResultGenerator.genFailResult(ResultCode.INTERNAL_SERVER_ERROR);
+		}
+        return ResultGenerator.genSuccessResult(pageInfo);
+    }
+}

cif-service/src/main/java/com/txz/cif/web/para/HospitalListParam.java

@@ -1,43 +0,0 @@
-package com.txz.cif.web.para;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import javax.persistence.*;
-
-@Data
-@ApiModel("医院列表入参")
-public class HospitalListParam {
-
-    @ApiModelProperty("第几页")
-    private Integer page;
-
-    @ApiModelProperty("每页显示条数")
-    private Integer size;
-
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty("开始时间")
-    private String startTime;
-
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty("结束时间")
-    private String endTime;
-
-    /**
-     * 医院名称
-     */
-    @ApiModelProperty("医院名称")
-    private String name;
-
-    @ApiModelProperty("医院id")
-    private Long hospitalId;
-
-
-
-}

cif-service/src/main/java/com/txz/cif/web/para/HospitalParam.java

@@ -1,118 +0,0 @@
-package com.txz.cif.web.para;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-import javax.validation.constraints.NotNull;
-
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="医院参数")
-public class HospitalParam  {
-
-
-    /**
-     * 名字
-     */
-    @NotNull
-    @ApiModelProperty(value="name名字")
-    private String name;
-
-    @NotNull
-    @ApiModelProperty(value="类型 1 专家组 2专家 3医院")
-    private Integer type;
-
-    @ApiModelProperty(value="所属系统多个使用，分割")
-    private String sysTypes;
-
-    /**
-     * 电话
-     */
-    @NotNull
-    @ApiModelProperty(value="电话（作为登录账号）系统唯一")
-    private String phoneNo;
-
-    @NotNull
-    @ApiModelProperty(value="登录账号系统唯一")
-    private String loginAccount;
-
-    @NotNull
-    @ApiModelProperty(value="登录密码")
-    private String password;
-
-    /**
-     * 邮箱
-     */
-    @ApiModelProperty(value="email邮箱")
-    private String email;
-
-    /**
-     * 头像
-     */
-    @ApiModelProperty(value="icon")
-    private String icon;
-
-    /**
-     * 居住地址
-     */
-    @ApiModelProperty(value="address居住地址")
-    private String address;
-
-    /**
-     * 所属省份代码
-     */
-    @ApiModelProperty(value="provinceCode所属省份代码")
-    private String provinceCode;
-
-    /**
-     * 所属城市码
-     */
-    @ApiModelProperty(value="cityCode所属城市码")
-    private String cityCode;
-
-    /**
-     * 所属区域代码
-     */
-    @ApiModelProperty(value="areaCode所属区域代码")
-    private String areaCode;
-
-    @ApiModelProperty(value="id")
-    private Long hospitalId;
-
-    /**
-     * 管理账号用户id（关联登录账号，结算账户）
-     */
-    @ApiModelProperty(value="userId管理账号用户id（关联登录账号，结算账户）")
-    private Long userId;
-
-    /**
-     * 结算方案id
-     */
-    @ApiModelProperty(value="settlePlanId结算方案id")
-    private Long settlePlanId;
-
-    /**
-     * 公告
-     */
-    @ApiModelProperty(value="notice公告")
-    private String notice;
-
-    /**
-     * 简介
-     */
-    @ApiModelProperty(value="introductory简介")
-    private String introductory;
-
-    /**
-     * 科室简介
-     */
-    @ApiModelProperty(value="officeIntro科室简介")
-    private String officeIntro;
-
-
-}

cif-service/src/main/java/com/txz/cif/web/para/MessageListParam.java

@@ -1,20 +0,0 @@
-package com.txz.cif.web.para;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import javax.persistence.*;
-
-@Data
-@ApiModel("消息列表入参")
-public class MessageListParam {
-
-    @ApiModelProperty("第几页")
-    private Integer page;
-
-    @ApiModelProperty("每页显示条数")
-    private Integer size;
-
-}

cif-service/src/main/java/com/txz/cif/web/para/MessageReadParam.java

@@ -1,18 +0,0 @@
-package com.txz.cif.web.para;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import java.util.List;
-import javax.persistence.*;
-
-@Data
-@ApiModel("读消息入参")
-public class MessageReadParam {
-
-    @ApiModelProperty("消息id")
-    private List<Long> ids;
-
-}

cif-service/src/main/java/com/txz/cif/web/para/OrgListParam.java → cif-service/src/main/java/com/txz/cif/web/para/MyUserParam.java

@@ -4,12 +4,9 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
-import javax.persistence.*;
-
 @Data
-@ApiModel("用户组列表入参")
-public class OrgListParam {
+@ApiModel("我的邀请入参")
+public class MyUserParam {
 
     @ApiModelProperty("第几页")
     private Integer page;
@@ -17,11 +14,8 @@ public class OrgListParam {
     @ApiModelProperty("每页显示条数")
     private Integer size;
 
-    /**
-     * 名称
-     */
-    @ApiModelProperty("名称")
-    private String name;
+    @ApiModelProperty("类型：1下级 2下下级")
+    private Integer type;
 
     /**
      * 开始时间
@@ -35,4 +29,15 @@ public class OrgListParam {
     @ApiModelProperty("结束时间")
     private String endTime;
 
+    /**
+     * 手机号
+     */
+    @ApiModelProperty("手机号")
+    private String phone;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+
+
 }

cif-service/src/main/java/com/txz/cif/web/para/OrderListParam.java

@@ -1,52 +0,0 @@
-package com.txz.cif.web.para;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-import javax.persistence.*;
-
-@Data
-@ApiModel("列表列表入参")
-public class OrderListParam {
-
-    @ApiModelProperty("第几页")
-    private Integer page;
-
-    @ApiModelProperty("每页显示条数")
-    private Integer size;
-
-    @ApiModelProperty(value="外部业务号")
-    private String bizNo;
-
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty("开始时间")
-    private String startTime;
-
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty("结束时间")
-    private String endTime;
-
-    /**
-     * 流水号
-     */
-    @ApiModelProperty("流水号")
-    private String flowNo;
-
-    @ApiModelProperty("状态 0待支付 1已支付 2支付失败  3用户已支付，待确认  4已退款 5部分退款 ")
-    private Integer status;
-
-    @ApiModelProperty("ukey序列号")
-    private String ukeyNo;
-
-    @ApiModelProperty("支付类型")
-    private Integer payType;
-
-
-
-}

cif-service/src/main/java/com/txz/cif/web/para/OrderParameters.java

@@ -1,65 +0,0 @@
-package com.txz.cif.web.para;
-
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author lxk
- */
-@Getter
-@Setter
-@ApiModel("创建订单参数")
-public class OrderParameters implements Serializable {
-    private static final long serialVersionUID = 4534920147012586549L;
-
-    /**
-     * 设备id
-     */
-    @ApiModelProperty(value="设备序列号")
-    private String deviceNo;
-
-    @ApiModelProperty(value="外部业务号")
-    private String bizNo;
-
-    @ApiModelProperty(value="u盾序列号")
-    private String ukeyNo;
-
-    /**
-     * 支付方式 1微信 2支付宝支付
-     */
-    @ApiModelProperty(value="payType支付方式 1微信 2支付宝支付")
-    private Byte payType;
-
-    @ApiModelProperty(value="支付类型 (1.APP支付2.扫码支付3.H5网页支付,4-JSAPI支付) ")
-    private Integer payModel;
-
-
-    @ApiModelProperty("商品列表")
-    private List<GoodsParam> items;
-
-    /**
-     * ip地址
-     */
-    @ApiModelProperty(value="ip地址")
-    private String ip;
-
-    @ApiModelProperty(value="时间戳")
-    private String timestamp;
-
-    @ApiModelProperty(value="随机字符串")
-    private String nonce;
-
-    @ApiModelProperty(value="签名结果：不参与签名")
-    private String sign;
-
-    @Override
-    public String toString() {
-        return JSON.toJSONString(this);
-    }
-}

cif-service/src/main/java/com/txz/cif/web/para/OrderQueryParameters.java

@@ -1,34 +0,0 @@
-package com.txz.cif.web.para;
-
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-/**
- * @author lxk
- */
-@Getter
-@Setter
-@ApiModel("主动查询订单支付结果")
-public class OrderQueryParameters implements Serializable {
-
-    private static final long serialVersionUID = -7213921378212552423L;
-
-    /**
-     * 订单id
-     */
-    @ApiModelProperty(value="订单id")
-    private Integer orderId;
-
-    @ApiModelProperty(value="订单的编号")
-    private String orderSn;
-
-    @Override
-    public String toString() {
-        return JSON.toJSONString(this);
-    }
-}

cif-service/src/main/java/com/txz/cif/web/para/OrgForm.java

@@ -1,40 +0,0 @@
-package com.txz.cif.web.para;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.*;
-
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@ApiModel(value="用户组入参")
-public class OrgForm {
-
-
-    /**
-     * 系统分类id
-     */
-    @ApiModelProperty(value="系统分类id")
-    private Integer sysType;
-
-    @ApiModelProperty(value="分类 1诊断 2会诊")
-    private Integer type;
-
-    /**
-     * 省级别地区码
-     */
-    @ApiModelProperty(value="省级别地区码")
-    private String areaCode;
-
-    /**
-     * 名称
-     */
-    @ApiModelProperty(value="名称")
-    private String name;
-
-    @ApiModelProperty(value="时间（判断是否忙碌）")
-    private String time;
-
-}