合并代码

Pu Zhibing

2025-01-20 f147a6ae7f543f6db757b3933adaf8f10b896ccf

合并代码

 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;

 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){

 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();