From 2ed6444f45d227e2acc6de65c3e8b582440fb83a Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期四, 06 三月 2025 09:20:40 +0800 Subject: [PATCH] 迭代版本:2.28 --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java index fb706ed..3c06c9e 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java @@ -144,10 +144,14 @@ @ApiModelProperty(value = "已提现金额") @TableField("withdraw_money") private BigDecimal withdrawMoney; + @ApiModelProperty(value = "审核中金额") + @TableField(exist = false) + private BigDecimal withdrawAuditMoney; @ApiModelProperty(value = "余额") @TableField("balance") private BigDecimal balance; + @ApiModelProperty(value = "门店订单总数") @TableField("order_number") @@ -168,7 +172,59 @@ @ApiModelProperty(value = "添加时间") @TableField("create_time") private LocalDateTime createTime; + + @ApiModelProperty("报备商户号") + @TableField("tradeMerchantNo") + private String tradeMerchantNo; + + @ApiModelProperty("收款银行卡号") + @TableField("receiverAccountNoEnc") + private String receiverAccountNoEnc; + + @ApiModelProperty("收款银行卡持卡人名称") + @TableField("receiverNameEnc") + private String receiverNameEnc; + + @ApiModelProperty("账户类型(对私账户201,对公账户204)") + @TableField("receiverAccountType") + private Integer receiverAccountType; + + @ApiModelProperty("收款账户联行号") + @TableField("receiverBankChannelNo") + 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 Double distance; + + @TableField(exist = false) + private Double score; + + @ApiModelProperty(value = "自己打分") + @TableField(exist = false) + private String myScore; } -- Gitblit v1.7.1