前端联调

huliguo

2025-04-23 f2070facdb5715e7349df69cfe257289c680d292

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java

@@ -34,13 +34,11 @@
    @TableField("name")
    private String name;

    @ApiModelProperty(value = "上级门店id")
    @TableField("pid")
    private Integer pid;

    @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
    @TableField("business_date")
    private Integer businessDate;

    @ApiModelProperty(value = "营业时间")
    @TableField("business_time")
    private String businessTime;

    @ApiModelProperty(value = "开始时间（HH:mm）")
    @TableField("start_time")
@@ -70,7 +68,7 @@
    @TableField("app_user_id")
    private Long appUserId;

    @ApiModelProperty(value = "客户电话（同步到t_phone表）")
    @ApiModelProperty(value = "客服电话（同步到t_phone表）")
    @TableField("service_tel")
    private String serviceTel;

@@ -86,56 +84,23 @@
    @TableField("latitude")
    private String latitude;

    @ApiModelProperty(value = "商家地址")
    @TableField("detail_address")
    private String detailAddress;

    @ApiModelProperty(value = "详细地址")
    @TableField("address")
    private String address;



    @ApiModelProperty(value = "状态（1=正常，2=冻结）")
    @TableField("status")
    private Integer status;

    @ApiModelProperty(value = "门店积分总数")
    @TableField("shop_all_point")
    private Integer shopAllPoint;

    @ApiModelProperty(value = "绑定下级门店分佣积分")
    @TableField("lower_level_share_point")
    private Integer lowerLevelSharePoint;

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

    @ApiModelProperty(value = "门店服务积分")
    @TableField("server_point")
    private Integer serverPoint;

    @ApiModelProperty(value = "门店已用积分")
    @TableField("use_point")
    private Integer usePoint;
    
    @ApiModelProperty(value = "门店剩余积分")
    @TableField("lave_point")
    private Integer lavePoint;

    @TableField(exist = false)
    private Integer laveUsePoint;

    @ApiModelProperty(value = "门店分佣总金额")
    @TableField("giveaway_all_money")
    private BigDecimal giveawayAllMoney;

    @ApiModelProperty(value = "门店分佣金额")
    @TableField("giveaway_money")
    private BigDecimal giveawayMoney;

    @ApiModelProperty(value = "绑定下级门店分佣金额")
    @TableField("lower_level_giveaway_money")
    private BigDecimal lowerLevelGiveawayMoney;

    @ApiModelProperty(value = "门店服务分佣金额")
    @TableField("server_giveaway_money")
    private BigDecimal serverGiveawayMoney;
    @ApiModelProperty(value = "评分")
    @TableField("score")
    private Double score;

    @ApiModelProperty(value = "可提现金额")
    @TableField("can_withdraw_money")
@@ -144,8 +109,8 @@
    @ApiModelProperty(value = "已提现金额")
    @TableField("withdraw_money")
    private BigDecimal withdrawMoney;
    @ApiModelProperty(value = "审核中金额")
    @TableField(exist = false)
    @ApiModelProperty(value = "c")
    @TableField("withdraw_audit_money")
    private BigDecimal withdrawAuditMoney;
    
    @ApiModelProperty(value = "余额")
@@ -157,13 +122,6 @@
    @TableField("order_number")
    private Integer orderNumber;

    @ApiModelProperty(value = "门店服务订单数")
    @TableField("server_order_number")
    private Integer serverOrderNumber;

    @ApiModelProperty(value = "单品自提订单数")
    @TableField("custom_order_number")
    private Integer customOrderNumber;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
@@ -194,35 +152,13 @@
    private String receiverBankChannelNo;


    @ApiModelProperty(value = "省")
    @TableField("province")
    private String province;

    @ApiModelProperty(value = "省编号")
    @TableField("province_code")
    private String provinceCode;

    @ApiModelProperty(value = "市")
    @TableField("city")
    private String city;

    @ApiModelProperty(value = "市编号")
    @TableField("city_code")
    private String cityCode;

    @ApiModelProperty(value = "区")
    @TableField("district")
    private String district;

    @ApiModelProperty(value = "区编号")
    @TableField("district_code")
    private String districtCode;
    @TableField(exist = false)
    private String fullAddress;

    @TableField(exist = false)
    private Double distance;

    @TableField(exist = false)
    private Double score;


    @ApiModelProperty(value = "自己打分")
    @TableField(exist = false)