SjS
|
c7b9a3da9f
|
Merge remote-tracking branch 'origin/master'
|
2025-04-27 16:01:30 +08:00 |
|
SjS
|
717b1f5648
|
广告待完成
|
2025-04-27 16:01:16 +08:00 |
|
磷叶
|
bd26ae2d34
|
Merge remote-tracking branch 'origin/master'
|
2025-04-27 15:23:41 +08:00 |
|
SjS
|
bd0a615254
|
更新
|
2025-04-27 15:23:12 +08:00 |
|
磷叶
|
d5b31fded3
|
Merge remote-tracking branch 'origin/wjh'
# Conflicts:
# ruoyi-service/src/main/java/com/ruoyi/bst/agreement/mapper/AgreementMapper.xml
|
2025-04-27 15:10:21 +08:00 |
|
磷叶
|
0fa0ace166
|
协议数据
|
2025-04-27 15:07:02 +08:00 |
|
SjS
|
c71d11ca5c
|
广告命名规范与校验
|
2025-04-27 13:51:19 +08:00 |
|
SjS
|
e7246d6029
|
协议新增分类
|
2025-04-27 11:08:49 +08:00 |
|
磷叶
|
828d8d3de0
|
轨迹权限
|
2025-04-27 10:39:35 +08:00 |
|
磷叶
|
a4937551ee
|
实名认证、运营区
|
2025-04-27 09:12:14 +08:00 |
|
磷叶
|
a7f7aaefc7
|
广告更新
|
2025-04-26 18:41:31 +08:00 |
|
磷叶
|
c5032f64b6
|
实名认证修改
|
2025-04-26 18:17:12 +08:00 |
|
SjS
|
cf9a74528f
|
协议新增分类
|
2025-04-26 16:56:40 +08:00 |
|
SjS
|
9686247e80
|
协议新增分类
|
2025-04-26 16:08:04 +08:00 |
|
磷叶
|
5e0bfd58eb
|
更新优化
|
2025-04-26 15:48:10 +08:00 |
|
SjS
|
c2f7c35db9
|
协议新增分类
|
2025-04-26 11:59:04 +08:00 |
|
SjS
|
f3bcba15a6
|
协议新增分类
|
2025-04-25 16:50:11 +08:00 |
|
SjS
|
1236c24184
|
前端广告展示
|
2025-04-25 11:20:03 +08:00 |
|
磷叶
|
4e96d3c16e
|
更新优化
|
2025-04-25 10:55:58 +08:00 |
|
磷叶
|
402c661ecf
|
重置密码功能
|
2025-04-25 09:59:00 +08:00 |
|
磷叶
|
6128067cf3
|
更新，待分成金额
|
2025-04-25 08:59:56 +08:00 |
|
磷叶
|
0f13f74374
|
更新，待分成金额
|
2025-04-25 08:52:23 +08:00 |
|
磷叶
|
5599f89863
|
更新优化
|
2025-04-24 17:29:21 +08:00 |
|
SjS
|
ab49c986d7
|
Merge remote-tracking branch 'origin/master'
|
2025-04-24 14:32:09 +08:00 |
|
SjS
|
c9989abc86
|
展示未禁用的公告
|
2025-04-24 14:31:57 +08:00 |
|
磷叶
|
cbbaf0a2e7
|
更新分成逻辑
|
2025-04-24 09:09:53 +08:00 |
|
磷叶
|
06adee38b8
|
提交
|
2025-04-23 18:35:11 +08:00 |
|
磷叶
|
8de83ac5b7
|
支付对账
|
2025-04-23 15:33:33 +08:00 |
|
磷叶
|
a867040c51
|
package com.ruoyi.bst.reconciliationDate.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 渠道对账对象 bst_reconciliation_date
*
* @author ruoyi
* @date 2025-04-23
*/
@Data
public class ReconciliationDate extends BaseEntity
{
private static final long serialVersionUID = 1L;
private Long id;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("日期")
private Date date;
@Excel(name = "渠道ID")
@ApiModelProperty("渠道ID")
private Long channelId;
@Excel(name = "渠道名称")
@ApiModelProperty("渠道名称")
private String channelName;
@Excel(name = "运营区ID")
@ApiModelProperty("运营区ID")
private Long areaId;
@Excel(name = "骑行订单支付金额")
@ApiModelProperty("骑行订单支付金额")
private BigDecimal orderPayAmount;
@Excel(name = "骑行订单退款金额")
@ApiModelProperty("骑行订单退款金额")
private BigDecimal orderRefundAmount;
@Excel(name = "骑行订单实收金额")
@ApiModelProperty("骑行订单实收金额")
private BigDecimal orderActualAmount;
@Excel(name = "支付总金额")
@ApiModelProperty("支付总金额")
private BigDecimal payAmount;
@Excel(name = "退款总金额")
@ApiModelProperty("退款总金额")
private BigDecimal refundAmount;
@Excel(name = "实收金额")
@ApiModelProperty("实收金额")
private BigDecimal actualAmount;
@Excel(name = "用户分成")
@ApiModelProperty("用户分成")
private BigDecimal userBonus;
@Excel(name = "用户分成退款")
@ApiModelProperty("用户分成退款")
private BigDecimal userBonusRefund;
@Excel(name = "用户实收金额")
@ApiModelProperty("用户实收金额")
private BigDecimal userActualBonus;
@Excel(name = "平台分成")
@ApiModelProperty("平台分成")
private BigDecimal platformBonus;
@Excel(name = "平台分成退款")
@ApiModelProperty("平台分成退款")
private BigDecimal platformBonusRefund;
@Excel(name = "平台实收金额")
@ApiModelProperty("平台实收金额")
private BigDecimal platformActualBonus;
@Excel(name = "分成总金额")
@ApiModelProperty("分成总金额")
private BigDecimal totalBonus;
@Excel(name = "分成退款总金额")
@ApiModelProperty("分成退款总金额")
private BigDecimal totalBonusRefund;
@Excel(name = "实际分成金额")
@ApiModelProperty("实际分成金额")
private BigDecimal actualBonus;
@Excel(name = "支付实收和分成差额")
@ApiModelProperty("支付实收和分成差额")
private BigDecimal difference;
@Excel(name = "渠道成本")
@ApiModelProperty("渠道成本")
private BigDecimal channelCost;
}
|
2025-04-23 11:34:59 +08:00 |
|
磷叶
|
79b67703c8
|
车型套餐关联
|
2025-04-23 09:56:45 +08:00 |
|
磷叶
|
248a6c0a7d
|
响铃范围
|
2025-04-22 14:27:55 +08:00 |
|
磷叶
|
a715642ef6
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# ruoyi-service/src/main/java/com/ruoyi/bst/ad/domain/Ad.java
# ruoyi-web/src/main/java/com/ruoyi/web/bst/AdController.java
|
2025-04-22 12:02:43 +08:00 |
|
磷叶
|
b637ec406e
|
添加日志
|
2025-04-22 12:00:46 +08:00 |
|
SjS
|
dd2aef808e
|
广告校验，前端补充,bug修复
|
2025-04-22 11:50:16 +08:00 |
|
SjS
|
ffe2d1b3bb
|
新增协议代码修改，代码风格规范
|
2025-04-21 19:13:08 +08:00 |
|
磷叶
|
ff5f29cf0b
|
debug
|
2025-04-21 18:27:12 +08:00 |
|
SjS
|
ffe409d63f
|
故障审核和广告审核完善
|
2025-04-21 18:19:00 +08:00 |
|
SjS
|
b8db402ede
|
客服完善
|
2025-04-21 10:58:03 +08:00 |
|
磷叶
|
a19a7a91a1
|
debug
|
2025-04-19 19:50:50 +08:00 |
|
磷叶
|
3b2bfd50d5
|
debug
|
2025-04-19 19:38:59 +08:00 |
|
磷叶
|
bef43caee5
|
debug
|
2025-04-19 17:44:49 +08:00 |
|
磷叶
|
c83307cb6d
|
debug
|
2025-04-19 16:04:47 +08:00 |
|
磷叶
|
79dc7fde0f
|
更新
|
2025-04-16 17:53:37 +08:00 |
|
磷叶
|
cc628ffc94
|
短信通知
|
2025-04-16 15:00:52 +08:00 |
|
磷叶
|
6adb8fd44d
|
Merge remote-tracking branch 'origin/master'
|
2025-04-15 18:16:35 +08:00 |
|
磷叶
|
21eb6a6a82
|
更新
|
2025-04-15 18:16:16 +08:00 |
|
SjS
|
c74cbd51b5
|
Merge remote-tracking branch 'origin/master'
|
2025-04-15 09:14:10 +08:00 |
|
SjS
|
3e66ad9d16
|
招商加盟，客服完善
|
2025-04-15 09:13:38 +08:00 |
|
磷叶
|
cb28a098ef
|
更新
|
2025-04-14 18:09:00 +08:00 |
|
磷叶
|
06877d967c
|
更新
|
2025-04-14 18:07:16 +08:00 |
|