Merge remote-tracking branch 'origin/master'

liujie

2023-08-16 5cb1979f05446792cc33a8cb6b7aaae906da5a70

 management/guns-admin/src/main/webapp/WEB-INF/view/system/tAgent/tAgentDetail.html

@@ -5,6 +5,7 @@
            <div class="ibox-title">
                <h5>管理</h5>
            </div>
            <input type="hidden" id="id" value="${id}">
            <div class="ibox-content">
                <div class="row row-lg">
                    <div class="col-sm-12">
@@ -54,53 +55,49 @@
                        <hr/>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-12 control-label form-group"  >
                                <label class="control-label" >时间筛选:</label>
                                <input id="time" placeholder="请选择时间" style="height: 30px">&nbsp;&nbsp;&nbsp;&nbsp;
                                <#button name="查询" icon="fa-search" clickFun="search()"/>&nbsp;&nbsp;&nbsp;&nbsp;
                            </div>
                        </div>
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >统计时间:</label>
                                <span>${startTimeToEndTime}</span>
                                <label class="control-label" >累计订单数:</label>
                                <label id="orderSum">${orderSum}</label>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >累计获得分账金额:</label>
                                <label id="income">${income}</label>
                            </div>
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >已使用优惠券数量:</label>
                                <label id="usedCoupon">${usedCoupon}</label>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >累计订单量:</label>
                                <label>${orderSum}</label>单
                                <label class="control-label" >有效订单数:</label>
                                <label id="validOrder">${validOrder}</label>
                            </div>
                            <div class="initialLevel col-sm-2 control-label form-group" >
                                <label class="control-label">累计优惠券金额:</label>
                                <label>${couponPriceSum}</label>元
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >有效订单:</label>
                                <label>${validOrder}</label>单
                                <label class="control-label" >可提现金额:</label>
                                <label id="balances">${balance}</label>
                            </div>
                            <div class="initialLevel col-sm-2 control-label form-group" >
                                <label class="control-label">累计发放司机金额:</label>
                                <label>${driverRecharge}</label>元
                            </div>
                        </div>
                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >已发放优惠券:</label>
                                <label>${issuedCoupon}</label>张
                            </div>
                            <div class="initialLevel col-sm-2 control-label form-group" >
                                <label class="control-label">司机数量:</label>
                                <label>${driverCount}</label>人
                                <label class="control-label" >累计优惠券金额:</label>
                                <label id="couponPriceSum">${couponPriceSum}</label>
                            </div>
                        </div>

                        <div class="initialLevel col-sm-12 control-label form-group"  >
                            <div class="initialLevel col-sm-3 control-label form-group"  >
                                <label class="control-label" >已使用优惠券:</label>
                                <label>${usedCoupon}</label>张
                        <div class="row">
                            <div class="form-group">
                                <label class="col-sm-2 control-label">明细记录：</label>
                                <div class="col-sm-10">
                                    <#table id="EnterprisePageTable"/>
                                </div>
                            </div>
                        </div>



                    </div>
                </div>
            </div>
@@ -114,5 +111,67 @@
        type: 'date',
        range: true
    });
    laydate.render({
        elem: '#time',
        type: 'date',
        range: true
    });
    
    function search() {
        var ajax = new $ax(Feng.ctxPath + "/tAgent/queryAgentSummaryData", function(data){
            if(data.code == 500){
                Feng.error("获取失败!" + data.message + "!");
                return false;
            }
            $('#orderSum').val(data.orderSum);
            $('#income').val(data.income);
            $('#usedCoupon').val(data.usedCoupon);
            $('#validOrder').val(data.validOrder);
            $('#balances').val(data.balance);
            $('#couponPriceSum').val(data.couponPriceSum);
        },function(data){
            Feng.error("获取失败!" + data.message + "!");
        });
        ajax.set({
            id: $('#id').val(),
            time: $('#time').val()
        });
        ajax.start();
    }


    $(function () {

        let tables = [
            {field: 'selectItem', radio: true},
            // {title: '主键', field: 'id', visible: true, align: 'center', valign: 'middle'},
            {title: '到账时间', field: 'createTime', visible: true, align: 'center', valign: 'middle'},
            {title: '交易类型', field: 'type', visible: true, align: 'center', valign: 'middle',
                formatter: function (value, row) {
                    switch (value) {
                        case 1:
                            return '充值'
                        case 2:
                            return '提现'
                        case 3:
                            return '佣金收入'
                        case 4:
                            return '保险收入'
                        case 5:
                            return '补贴支付'
                    }
                }
            },
            {title: '交易金额', field: 'money', visible: true, align: 'center', valign: 'middle'},
            {title: '账户余额', field: 'balance', visible: true, align: 'center', valign: 'middle'}
        ]

        var table = new BSTable("EnterprisePageTable", "/tAgent/queryAgentCompanyFundFlow", tables);
        table.setPaginationType("server");
        table.setQueryParams({
            id: $('#id').val()
        })
        table.init();
    })
</script>
@}