From 2e6c812f367e1c51ec116a2eb1920872b46bfbea Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 07 四月 2025 11:35:51 +0800
Subject: [PATCH] 修改订单支付金额重复添加问题
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 ba28085..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")
@@ -163,7 +167,6 @@
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@ApiModelProperty(value = "添加时间")
@@ -191,5 +194,37 @@
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