From f147a6ae7f543f6db757b3933adaf8f10b896ccf Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 20 一月 2025 19:23:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java | 25 +++++++++++++++++++++++--
cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js | 2 +-
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 5 +++++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java
index fe8604c..ef7490b 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/other/model/TGameRecord.java
@@ -15,7 +15,7 @@
/**
* <p>
- *
+ *
* </p>
*
* @author administrator
@@ -27,7 +27,7 @@
@TableName("t_game_record")
public class TGameRecord extends Model<TGameRecord> {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@@ -43,6 +43,11 @@
*/
@TableField("payType")
private Integer payType;
+ /**
+ * 场地id
+ */
+ @TableField("siteId")
+ private Integer siteId;
/**
* 金额
@@ -61,6 +66,22 @@
private Date time;
+ /**
+ * 分账流水号
+ */
+ @TableField("fenzhangNo")
+ private String fenzhangNo;
+ /**
+ * 分账业务号 存值表明已分账 未存表明未分账
+ */
+ @TableField("fenzhangOrderNo")
+ private String fenzhangOrderNo;
+ // 分账金额
+ @TableField("fenzhangAmount")
+ private BigDecimal fenzhangAmount;
+ // 分账回退流水号
+ @TableField("fenzhangRefundNo")
+ private String fenzhangRefundNo;
@Override
protected Serializable pkVal() {
return this.id;
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
index a6007b2..5c76092 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
@@ -256,6 +256,11 @@
<script src="${ctxPath}/modular/system/dataStatistics/echarts.min.js"></script>
<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
<script>
+ laydate.render({
+ elem: '#beginTime'
+ , trigger: 'click'
+ , range: true
+ });
function search1() {
var time = $("#beginTime").val();
var ajax9 = new $ax(Feng.ctxPath + "/data/type1", function(data){
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js b/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js
index 7157e61..f61d585 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/gateData/gateData.js
@@ -49,7 +49,7 @@
var totalNumber= document.getElementById("totalNumber");
totalNumber.innerText = "场地总人次： " + data +"次";
});
- ajax.set("storeId",)
+ ajax.set("storeId",$("#store").val())
ajax.start();
var queryData = {};
queryData['storeId'] = $("#store").val();
--
Gitblit v1.7.1