前端联调

huliguo

2025-04-23 f2070facdb5715e7349df69cfe257289c680d292

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AppUser.java

@@ -43,9 +43,7 @@
    @ApiModelProperty(value = "用户")
    @TableField("name")
    private String name;
    @ApiModelProperty("会员名称")
    @TableField(exist = false)
    private String vipName;


    @ApiModelProperty(value = "手机号")
    @TableField("phone")
@@ -87,65 +85,29 @@
    @ApiModelProperty(value = "最后一次登录时间")
    @TableField("last_login_time")
    private LocalDateTime lastLoginTime;
    
    @ApiModelProperty(value = "顶级推广人id")
    @TableField("top_invite_id")
    private Long topInviteId;

    @ApiModelProperty(value = "推广人id")
    @TableField("invite_user_id")
    private Long inviteUserId;
    @ApiModelProperty(value = "推广人姓名")
    @TableField(exist = false)
    private String inviteUserName;
    @ApiModelProperty(value = "指导老师")
    @TableField(exist = false)
    private String teacher;
    @TableField(exist = false)
    private String teacherPhone;

    @ApiModelProperty(value = "绑定门店id")
    @ApiModelProperty(value = "门店id")
    @TableField("shop_id")
    private Integer shopId;
    @ApiModelProperty(value = "绑定门店名称")
    @ApiModelProperty(value = "门店名称")
    @TableField(exist = false)
    private String shopName;
    @ApiModelProperty(value = "绑定门店列表")
    @ApiModelProperty(value = "门店列表")
    @TableField(exist = false)
    private List<String> shopNames;
    @ApiModelProperty(value = "绑定门店封面")
    @ApiModelProperty(value = "门店封面")
    @TableField(exist = false)
    private String shopCover;
    @ApiModelProperty(value = "绑定门店地址")
    @ApiModelProperty(value = "门店地址")
    @TableField(exist = false)
    private String shopAddress;
    @ApiModelProperty(value = "上级人员信息")

    @ApiModelProperty(value = "门店状态（0-未拥有门店，1-正常，2-冻结）")
    @TableField(exist = false)
    private AppUser topUser;
    @ApiModelProperty(value = "下级人员列表")
    @TableField(exist = false)
    private List<AppUser> bottomUsers;
    private Integer shopStatus;

    @TableField(exist = false)
    private Page<AppUser> bottomUsersPage;

    @ApiModelProperty(value = "合伙人积分数")
    @TableField("part_point")
    private Integer partPoint;

    @ApiModelProperty(value = "合伙人培育积分数")
    @TableField("part_grow_point")
    private Integer partGrowPoint;

    @ApiModelProperty(value = "消费积分数")
    @TableField("shop_point")
    private Integer shopPoint;

    @ApiModelProperty(value = "返佣积分数")
    @TableField("share_point")
    private Integer sharePoint;

    @ApiModelProperty(value = "消费总金额")
    @ApiModelProperty(value = "消费总金额（微信支付总金额）")
    @TableField("shop_amount")
    private BigDecimal shopAmount;

@@ -153,109 +115,35 @@
    @TableField("last_shop_time")
    private LocalDateTime lastShopTime;

    @ApiModelProperty(value = "账户余额")
    @TableField("balance")
    private BigDecimal balance;

    @ApiModelProperty(value = "可提现金额")
    @TableField("withdrawable_amount")
    private BigDecimal withdrawableAmount;

    @ApiModelProperty(value = "已提现金额")
    @TableField("withdrawn_amount")
    private BigDecimal withdrawnAmount;

    @ApiModelProperty(value = "充值总金额")
    @TableField("total_recharge_amount")
    private BigDecimal totalRechargeAmount;

    @ApiModelProperty(value = "红包总金额")
    @TableField("total_red_packet_amount")
    private BigDecimal totalRedPacketAmount;

    @ApiModelProperty(value = "分销总金额")
    @TableField("total_distribution_amount")
    private BigDecimal totalDistributionAmount;

    @ApiModelProperty(value = "冻结分佣金额")
    @TableField("freeze_commission_amount")
    private BigDecimal freezeCommissionAmount;

    @ApiModelProperty(value = "冻结分佣积分")
    @TableField("freeze_commission_point")
    private Integer freezeCommissionPoint;

    @ApiModelProperty(value = "拉新人积分总数")
    @TableField("total_invite_point")
    private Integer totalInvitePoint;

    @ApiModelProperty(value = "注册积分总数")
    @TableField("total_register_point")
    private Integer totalRegisterPoint;
    
    @ApiModelProperty(value = "绑定下级门店分佣积分")
    @TableField("lower_level_share_point")
    private Integer lowerLevelSharePoint;

    @ApiModelProperty(value = "门店返佣积分")
    @TableField("shop_share_point")
    private Integer shopSharePoint;
    
    @ApiModelProperty(value = "门店业绩积分")
    @TableField("shop_achievement_point")
    private Integer shopAchievementPoint;

    @ApiModelProperty(value = "门店服务费（门店核销获得）")
    @TableField("shop_service_fee")
    private BigDecimal shopServiceFee;

    @ApiModelProperty(value = "门店返佣金额（绑定用户消费后返佣）")
    @TableField("shop_commission")
    private BigDecimal shopCommission;

//    @ApiModelProperty(value = "做工积分总数")
//    @TableField("total_work_point")
//    private Integer totalWorkPoint;

    @ApiModelProperty(value = "每日分享积分")
    @TableField("total_share_point")
    private Integer totalSharePoint;

    @ApiModelProperty(value = "每日签到积分")
    @TableField("total_sign_point")
    private Integer totalSignPoint;

    @ApiModelProperty(value = "使用时长积分")
    @TableField("total_hour_point")
    private Integer totalHourPoint;

    @ApiModelProperty(value = "技师业绩积分总数")
    @TableField("total_performance_point")
    private Integer totalPerformancePoint;

    @ApiModelProperty(value = "总积分")
    @TableField("total_point")
    private Integer totalPoint;

    @ApiModelProperty(value = "剩余积分")
    @TableField("lave_point")
    private Integer lavePoint;
    
    @ApiModelProperty(value = "可用积分")
    @TableField("available_point")
    private Integer availablePoint;
    
    @ApiModelProperty(value = "可用总积分数")
    @TableField("total_available_point")
    private Integer totalAvailablePoint;

    @ApiModelProperty(value = "可转增积分")
    @TableField("transferable_point")
    private Integer transferablePoint;
    
    @ApiModelProperty(value = "是否可更换推广人（0=否，1=是）")
    @TableField("change_promoter")
    private Integer changePromoter;
    @ApiModelProperty(value = "充值积分")
    @TableField("recharge_point")
    private Integer rechargePoint;


    @ApiModelProperty(value = "取消订单积分")
    @TableField("cancel_point")
    private Integer cancelPoint;

    @ApiModelProperty(value = "兑换商品消费积分")
    @TableField("exchange_point")
    private Integer exchangePoint;

    @ApiModelProperty(value = "转赠（转入）积分")
    @TableField("transferable_in_point")
    private Integer transferableInPoint;

    @ApiModelProperty(value = "转赠（转出）积分")
    @TableField("transferable_out_point")
    private Integer transferableOutPoint;

    
    @ApiModelProperty(value = "经度")
    @TableField("longitude")
@@ -292,45 +180,16 @@
    @TableField("qr_code")
    private String qrCode;

    @ApiModelProperty("等级1会员数")
    @TableField(exist = false)
    private Long count1;

    @ApiModelProperty("等级2会员数")
    @ApiModelProperty("消费绿电分数")
    @TableField(exist = false)
    private Long count2;

    @ApiModelProperty("等级3会员数")
    @TableField(exist = false)
    private Long count3;

    @ApiModelProperty("等级4会员数")
    @TableField(exist = false)
    private Long count4;

    @ApiModelProperty("等级5会员数")
    @TableField(exist = false)
    private Long count5;

    @ApiModelProperty("等级6会员数")
    @TableField(exist = false)
    private Long count6;

    @ApiModelProperty("等级7会员数")
    @TableField(exist = false)
    private Long count7;

    @ApiModelProperty("是否签到1是0否")
    @TableField(exist = false)
    private Integer isSign;
    private Integer customPoint;

    @ApiModelProperty("绑定门店id列表")
    @TableField(exist = false)
    private Set<Integer> shopIds;

    @ApiModelProperty(value = "降级预警（0=否，1=是）")
    @TableField("is_danger")
    private Integer isDanger;


    @ApiModelProperty(value = "最后下单时间")
    @TableField(exist = false)
@@ -340,29 +199,14 @@
    @TableField(exist = false)
    private Set<Long> userIds;

    @TableField(exist = false)
    private Integer excludeStatus;


    public String getIdStr(){
        return String.valueOf(id);
    }


    public Integer getUserTotalPoint(){
        if (totalPoint == null){
            totalPoint = 0;
        }
        if (lowerLevelSharePoint == null){
            lowerLevelSharePoint = 0;
        }
        if (shopSharePoint == null){
            shopSharePoint = 0;
        }
        if (shopAchievementPoint == null){
            shopAchievementPoint = 0;
        }
        return totalPoint - lowerLevelSharePoint - shopSharePoint - shopAchievementPoint;
    }