From 513961ecebcfd0619ede7a7edb7ac5e27de28d26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 01 一月 2025 17:11:23 +0800
Subject: [PATCH] 增加第三方支付
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 365ee43..ba28085 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
@@ -98,9 +98,9 @@
@TableField("shop_all_point")
private Integer shopAllPoint;
- @ApiModelProperty(value = "门店业绩积分")
- @TableField("shop_point")
- private Integer shopPoint;
+ @ApiModelProperty(value = "绑定下级门店分佣积分")
+ @TableField("lower_level_share_point")
+ private Integer lowerLevelSharePoint;
@ApiModelProperty(value = "门店返佣积分")
@TableField("share_point")
@@ -110,13 +110,16 @@
@TableField("server_point")
private Integer serverPoint;
- @ApiModelProperty(value = "下级门店返佣积分")
- @TableField("lower_level_rebate_points")
- private Integer lowerLevelRebatePoints;
-
@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")
@@ -141,6 +144,10 @@
@ApiModelProperty(value = "已提现金额")
@TableField("withdraw_money")
private BigDecimal withdrawMoney;
+
+ @ApiModelProperty(value = "余额")
+ @TableField("balance")
+ private BigDecimal balance;
@ApiModelProperty(value = "门店订单总数")
@TableField("order_number")
@@ -162,10 +169,27 @@
@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(exist = false)
- private String managerName;
}
--
Gitblit v1.7.1