From deb91eb570baecdae92aeeb105661209f59e06e2 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 01 四月 2025 14:23:46 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0 --- cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js | 123 +++++++++++++++++++++++++++++++++++------ 1 files changed, 105 insertions(+), 18 deletions(-) diff --git a/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js b/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js index da437a4..1c00185 100644 --- a/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js +++ b/cloud-server-management/src/main/webapp/static/modular/system/tPayHuimin/tPayHuimin.js @@ -14,20 +14,25 @@ TPayHuimin.initColumn = function () { return [ {field: 'selectItem', radio: true}, - {title: '主键id', field: 'id', visible: true, align: 'center', valign: 'middle'}, - {title: '金额', field: 'salesMoney', visible: true, align: 'center', valign: 'middle'}, - {title: '购买用户id', field: 'appUserId', visible: true, align: 'center', valign: 'middle'}, - {title: '绑定人员id,多个逗号拼接,关联student表', field: 'studentId', visible: true, align: 'center', valign: 'middle'}, + {title: '主键id', field: 'id', visible: false, align: 'center', valign: 'middle'}, + {title: '惠民卡名称', field: 'huiMinName', visible: true, align: 'center', valign: 'middle'}, + {title: '惠民卡类型', field: 'huiMinType', visible: true, align: 'center', valign: 'middle', + formatter:function(value,row,index){ + return {1: '年度卡', 2: '年内卡'}[value]; + }}, + {title: '售卖金额', field: 'salesMoney', visible: true, align: 'center', valign: 'middle'}, + {title: '所属运营商', field: 'operatorName', visible: true, align: 'center', valign: 'middle'}, + {title: '可用门店', field: 'storeName', visible: true, align: 'center', valign: 'middle'}, + {title: '购买用户', field: 'userName', visible: true, align: 'center', valign: 'middle'}, + {title: '联系电话', field: 'phone', visible: true, align: 'center', valign: 'middle'}, + {title: '购买时间', field: 'paymentTime', visible: true, align: 'center', valign: 'middle'}, + {title: '绑定人员', field: 'studentName', visible: true, align: 'center', valign: 'middle'}, + {title: '已用次数', field: 'useTimes', visible: true, align: 'center', valign: 'middle'}, {title: '有效期', field: 'endTime', visible: true, align: 'center', valign: 'middle'}, - {title: '状态1使用中2已退款', field: 'status', visible: true, align: 'center', valign: 'middle'}, - {title: '创建时间', field: 'insertTime', visible: true, align: 'center', valign: 'middle'}, - {title: '付款时间', field: 'paymentTime', visible: true, align: 'center', valign: 'middle'}, - {title: '付款方式1微信2支付宝', field: 'paymentType', visible: true, align: 'center', valign: 'middle'}, - {title: '订单号', field: 'code', visible: true, align: 'center', valign: 'middle'}, - {title: '第三方支付流水号', field: 'orderNumber', visible: true, align: 'center', valign: 'middle'}, - {title: '退款时间', field: 'refundTime', visible: true, align: 'center', valign: 'middle'}, - {title: '退款状态 1未退款 2已退款 3线下退款(使用过或超过七日退款)', field: 'refundStatus', visible: true, align: 'center', valign: 'middle'}, - {title: '惠民卡id', field: 'cardId', visible: true, align: 'center', valign: 'middle'} + {title: '状态', field: 'status', visible: true, align: 'center', valign: 'middle', + formatter:function(value,row,index){ + return {1: '使用中', 2: '已退款'}[value]; + }} ]; }; @@ -92,19 +97,101 @@ ajax.start(); } }; - +TPayHuimin.getStaticsData = function (){ + var queryData = TPayHuimin.getQueryParam(); + //提交信息 + var ajax = new $ax(Feng.ctxPath + "/tPayHuimin/getStaticsData", function(data){ + if (data.data!=null && data.data !=''){ + $('#totalAmount').text(data.data.totalAmount); + $('#refundAmount').text(data.data.refundAmount); + } + },function(data){ + Feng.error("获取统计数据失败!" + data.responseJSON.message + "!"); + }); + ajax.setData(queryData); + ajax.start(); +} +TPayHuimin.refund = function (){ + if (this.check()) { + if (TPayHuimin.seItem.refundStatus != 1){ + Feng.error("该商品已退款"); + return; + } + let operation = function(){ + let ajax = new $ax(Feng.ctxPath + "/tPayHuimin/refund", function () { + Feng.success("退款成功!"); + TPayHuimin.table.refresh(); + }, function (data) { + Feng.error("退款失败!" + data.responseJSON.message + "!"); + }); + ajax.set("id", TPayHuimin.seItem.id); + ajax.start(); + }; + Feng.confirm("确认退款所选惠民卡吗?",operation); + } +} +TPayHuimin.export = function (){ + var queryData = TPayHuimin.getQueryParam(); + // 生成带参数的完整URL + var exportUrl = Feng.ctxPath + "/tPayHuimin/export?" + $.param(queryData); + window.location.href = exportUrl; +} +/** + * 获取查询参数 + * @returns {{}} + */ +TPayHuimin.getQueryParam = function () { + var queryData = {}; + queryData['huiMinName'] = $("#huiMinName").val(); + queryData['huiMinType'] = $("#huiMinType").val(); + queryData['operatorId'] = $("#operatorId").val(); + queryData['useId'] = $("#useId").val(); + queryData['userName'] = $("#userName").val(); + queryData['phone'] = $("#phone").val(); + let paymentTimeStr = $("#paymentTimeStr").val(); + if (paymentTimeStr){ + queryData['paymentTimeStart'] = paymentTimeStr.split('~')[0]+' 00:00:00'; + queryData['paymentTimeEnd'] = paymentTimeStr.split('~')[1]+' 23:59:59'; + } + let endTimeStr = $("#endTimeStr").val(); + if (endTimeStr){ + queryData['endTimeStart'] = endTimeStr.split('~')[0]+' 00:00:00'; + queryData['endTimeEnd'] = endTimeStr.split('~')[1]+' 23:59:59'; + } + queryData['status'] = $("#status").val(); + //过滤空值 + Object.keys(queryData).forEach(key => { + if (queryData[key] === null || queryData[key] === '') { + delete queryData[key]; + } + }); + return queryData; +} /** * 查询惠民卡列表 */ TPayHuimin.search = function () { - var queryData = {}; - queryData['condition'] = $("#condition").val(); + var queryData = TPayHuimin.getQueryParam(); TPayHuimin.table.refresh({query: queryData}); + TPayHuimin.getStaticsData(); }; - +TPayHuimin.resetSearch = function () { + var queryData = {}; + $("#huiMinName").val(''); + $("#huiMinType option:first").prop("selected", true); + $("#operatorId option:first").prop("selected", true); + $("#useId option:first").prop("selected", true); + $("#userName").val(''); + $("#phone").val(''); + $("#paymentTimeStr").val(''); + $("#endTimeStr").val(''); + $("#status option:first").prop("selected", true); + TPayHuimin.search(); +}; $(function () { var defaultColunms = TPayHuimin.initColumn(); var table = new BSTable(TPayHuimin.id, "/tPayHuimin/list", defaultColunms); - table.setPaginationType("client"); + table.setPaginationType("server"); TPayHuimin.table = table.init(); + TPayHuimin.getStaticsData(); }); -- Gitblit v1.7.1