From 0c980680e46ae0630e565d2c4dcced8b8737842a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 16 一月 2025 15:50:29 +0800
Subject: [PATCH] 12.18
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 90 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 76 insertions(+), 14 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 d9cba6a..b09a71e 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
@@ -38,9 +38,9 @@
@TableField("pid")
private Integer pid;
- @ApiModelProperty(value = "营业星期（1,2,3,4,5,6,7）")
+ @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
@TableField("business_date")
- private String businessDate;
+ private Integer businessDate;
@ApiModelProperty(value = "开始时间（HH:mm）")
@TableField("start_time")
@@ -96,27 +96,30 @@
@ApiModelProperty(value = "门店积分总数")
@TableField("shop_all_point")
- private BigDecimal shopAllPoint;
+ private Integer shopAllPoint;
- @ApiModelProperty(value = "门店业绩积分")
- @TableField("shop_point")
- private BigDecimal shopPoint;
+ @ApiModelProperty(value = "绑定下级门店分佣积分")
+ @TableField("lower_level_share_point")
+ private Integer lowerLevelSharePoint;
@ApiModelProperty(value = "门店返佣积分")
@TableField("share_point")
- private BigDecimal sharePoint;
+ private Integer sharePoint;
@ApiModelProperty(value = "门店服务积分")
@TableField("server_point")
- private BigDecimal serverPoint;
-
- @ApiModelProperty(value = "下级门店返佣积分")
- @TableField("lower_level_rebate_points")
- private BigDecimal lowerLevelRebatePoints;
+ private Integer serverPoint;
@ApiModelProperty(value = "门店已用积分")
@TableField("use_point")
- private BigDecimal usePoint;
+ private Integer usePoint;
+
+ @ApiModelProperty(value = "门店剩余积分")
+ @TableField("lave_point")
+ private Integer lavePoint;
+
+ @TableField(exist = false)
+ private Integer laveUsePoint;
@ApiModelProperty(value = "门店分佣总金额")
@TableField("giveaway_all_money")
@@ -141,6 +144,13 @@
@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")
@@ -156,12 +166,64 @@
@ApiModelProperty(value = "删除（0=否，1=是）")
@TableField("del_flag")
- @TableLogic
private Integer delFlag;
@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