From 57fabdd8b46973273ed51e8c43a0b56da4933178 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 25 Sep 2020 14:09:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=92=A4=E5=9B=9E=E5=AE=A1=E6=89=B9=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/CompanyStatementPool/lists.html | 10 +- Data/update.sql | 120 +++++++++++++++++- 2 files changed, 126 insertions(+), 4 deletions(-) diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index b7c296512..749bad545 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -389,11 +389,15 @@ }); $("#verifyReturn").on("click",function(){ - + var status = [-1,1]; var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - return $(elem).val(); - }).get(); + if($.inArray( $(elem).data("status"),status) == 1 || $.inArray( $(elem).data("status"),status) == 1){ + return $(elem).val(); + } + + }).get(); + console.log(text); if(text.length > 40){ layer.msg("" + '为保证效率暂不支持超过40条的批量操作' + ""); return; diff --git a/Data/update.sql b/Data/update.sql index 8bc7dccf0..01cf88d5c 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -2497,8 +2497,126 @@ ADD COLUMN `performance_profit` decimal(13, 2) NULL DEFAULT 0.00 COMMENT '维护 ALTER TABLE `sys_ucenter_member` ADD COLUMN `work_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '离职状态' AFTER `openid_sign`; +ALTER TABLE `tab_company_relation_log` +ADD COLUMN `first_company_info` longtext NULL COMMENT '甲方公司信息' AFTER `first_company_type`, +ADD COLUMN `second_company_info` longtext NULL COMMENT '乙方公司信息' AFTER `second_company_type`; + +CREATE TABLE `tab_payment_orders` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `merchant_id` int(11) NOT NULL COMMENT '商户ID', + `order_no` varchar(100) NOT NULL COMMENT '订单号', + `business_type` varchar(20) NOT NULL DEFAULT '' COMMENT '业务类型', + `order_amount` decimal(12, 2) not null default '0.00' comment '订单金额', + `fee` decimal(12, 2) not null default '0.00' comment '手续费', + `product_name` varchar(255) NOT NULL DEFAULT '' COMMENT '产品名称', + `channel_order_no` varchar(100) NOT NULL DEFAULT '' COMMENT '渠道订单号', + `channel_user_account` varchar(100) NOT NULL DEFAULT '' COMMENT '渠道用户', + `remark` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', + `created_at` datetime NOT NULL COMMENT '订单创建时间', + `finished_at` datetime NOT NULL COMMENT '订单完成时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + + +/** +zyx 2020-09-25 + */ ALTER TABLE `tab_market_altogether` ADD COLUMN `market_check` tinyint(2) NULL DEFAULT 0 COMMENT '市场确认 0 未确认 1 确认' AFTER `performance_profit`, ADD COLUMN `market_check_detail` varchar(100) NULL DEFAULT '' COMMENT '市场确认详情' AFTER `market_check`, ADD COLUMN `finance_check` tinyint(2) NULL DEFAULT 0 COMMENT '财务确认 0 未确认 1 确认' AFTER `market_check_detail`, -ADD COLUMN `finance_check_detail` varchar(100) NULL DEFAULT '' COMMENT '财务确认详情' AFTER `finance_check`; \ No newline at end of file +ADD COLUMN `finance_check_detail` varchar(100) NULL DEFAULT '' COMMENT '财务确认详情' AFTER `finance_check`; + +ALTER TABLE `tab_promote_company` +ADD COLUMN `is_inside` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否为内部公司' AFTER `ali_partner`; + +ALTER TABLE `tab_settleup_marketorder` +DROP COLUMN `company_name`, +ADD COLUMN `company_name` varchar(50) NULL DEFAULT '' COMMENT '公司名称' AFTER `company_id`; + +CREATE TABLE `tab_aggregate_lack_statement_info` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `company_id` int(11) NULL DEFAULT 0 COMMENT '对账公司id', + `company_name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '对账公司名称', + `company_belong_name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '归属团体', + `company_info` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '公司其他信息json', + `statement_money` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '对账金额', + `pay_amount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '总计', + `platform_amount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '平台流水金额', + `fine` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '罚款', + `reward` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '奖励', + `statement_begin_time` int(11) NOT NULL DEFAULT 0 COMMENT '对账开始时间', + `statement_end_time` int(11) NOT NULL DEFAULT 0 COMMENT '对账截止时间', + `statement_info` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '订单相关信息json', + `statement_pool_num` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '生成此单的汇总单单号', + `is_payment` tinyint(3) NOT NULL DEFAULT 1 COMMENT '是否需要打款：1-是 2-否(线下)', + `is_pool` tinyint(3) NOT NULL DEFAULT 0 COMMENT '是否被汇总:0否/1是', + `withdraw_type` tinyint(2) NULL DEFAULT 0 COMMENT '对账类型(0-周结 1月结 2补点 3特殊补点)', + PRIMARY KEY (`id`) USING BTREE, + INDEX `company_tid`(`company_id`) USING BTREE, + INDEX `statement_begin_time`(`statement_begin_time`) USING BTREE, + INDEX `statement_end_time`(`statement_end_time`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '未满足支付条件的公司信息' ROW_FORMAT = Dynamic; + +CREATE TABLE `tab_aggregate_statement_info` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `pool_id` int(11) NOT NULL COMMENT '汇总单id', + `company_id` int(11) NULL DEFAULT 0 COMMENT '对账公司id', + `company_name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '对账公司名称', + `company_belong_name` varchar(60) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '归属团体', + `company_info` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '公司其他信息json', + `statement_money` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '对账金额', + `pay_amount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '总计', + `platform_amount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '平台流水金额', + `fine` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '罚款', + `reward` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '奖励', + `statement_begin_time` int(11) NOT NULL DEFAULT 0 COMMENT '对账开始时间', + `statement_end_time` int(11) NOT NULL DEFAULT 0 COMMENT '对账截止时间', + `statement_num` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '结算单号', + `statement_info` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '订单相关信息json', + `verify_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '验证状态 -1:配置信息不全 0:信息未确认 1:允许打款 2:线下无需打款', + `pay_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '打款状态 -1:打款失败 0:未打款 1:打款成功', + `pay_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '支付完成时间', + `pay_type` tinyint(2) NOT NULL DEFAULT 0 COMMENT '打款类型 1提现 2线上打款 3线下打款', + `pay_info` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '打款信息', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '备注', + `withdraw_type` tinyint(2) NULL DEFAULT 0 COMMENT '对账类型(0-周结 1月结 2补点 3特殊补点)', + PRIMARY KEY (`id`) USING BTREE, + INDEX `company_tid`(`company_id`) USING BTREE, + INDEX `statement_begin_time`(`statement_begin_time`) USING BTREE, + INDEX `statement_end_time`(`statement_end_time`) USING BTREE, + INDEX `pay_status`(`pay_status`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '对账单汇总详情' ROW_FORMAT = Dynamic; + +CREATE TABLE `tab_aggregate_statement_pool` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `statement_num` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '结算批量单号', + `statement_ids` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '涉及的结算单id', + `withdraw_type` tinyint(2) NULL DEFAULT 3 COMMENT '对账类型(0-周结 1月结 2补点 3无)', + `create_lack_ids` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '生成的lackid', + `del_lack_ids` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '合并计算的lackid', + `statement_begin_time` int(11) NOT NULL DEFAULT 0 COMMENT '对账开始时间', + `statement_end_time` int(11) NOT NULL DEFAULT 0 COMMENT '对账截止时间', + `statement_money` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '对账金额', + `lack_statement_money` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '不结算金额', + `pay_amount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '总计', + `platform_amount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '平台流水金额', + `lack_platform_amount` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '不结算平台流水金额', + `fine` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '罚款', + `reward` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '奖励', + `online_money` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '成功支付金额', + `withdraw_money` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '提现成功金额', + `verify_status` tinyint(2) NOT NULL DEFAULT 0 COMMENT '审核状态 -2:打款失败 -1审批拒绝 0:未审批 1:审核通过 2:待打款 3:打款中 4:打款成功', + `verify_log` text CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '审批相关信息json', + `ext_file` text CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '凭证地址', + `is_payment` tinyint(3) NOT NULL DEFAULT 1 COMMENT '是否需要打款：1-是 2-否(线下)', + `op_time` int(11) NOT NULL DEFAULT 0 COMMENT '操作时间', + `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE, + INDEX `op_time`(`op_time`) USING BTREE, + INDEX `verify_status`(`verify_status`) USING BTREE, + INDEX `statement_end_time`(`statement_end_time`) USING BTREE, + INDEX `statement_begin_time`(`statement_begin_time`) USING BTREE, + INDEX `statement_num`(`statement_num`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '对账单汇总' ROW_FORMAT = Dynamic; \ No newline at end of file From b539e8d1b0dd40996759669ee40a6852440c1e45 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 25 Sep 2020 14:19:41 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B1=87=E6=80=BB=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E6=92=A4=E5=9B=9Ebug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/CompanyStatementPool/lists.html | 71 +++++++++++-------- 1 file changed, 41 insertions(+), 30 deletions(-) diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index 749bad545..36ad7be64 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -389,53 +389,64 @@ }); $("#verifyReturn").on("click",function(){ - var status = [-1,1]; + var status = false; var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) { - - if($.inArray( $(elem).data("status"),status) == 1 || $.inArray( $(elem).data("status"),status) == 1){ + console.log($(elem).data("status")) + if($(elem).data("status") == 1 || $(elem).data("status") == -1){ return $(elem).val(); + } else { + status = true; } }).get(); - console.log(text); + if(text.length > 40){ layer.msg("" + '为保证效率暂不支持超过40条的批量操作' + ""); return; } if(text.length < 1){ - layer.msg("" + '无需要汇总的操作'+""); + layer.msg("" + '无需要审批撤回的操作'+""); return; } text = text.join(","); - layer.confirm('【提示】点击确认后，审批即撤回', { - btn: ['确认','取消'], - title:false - }, function(){ - _doAgreeApply(); - }); + if (status) { + layer.confirm("审批撤回仅会对【'审批通过','审批拒绝'】的申请进行处理，选择中包含其他的状态的申请将被忽略，点击取消停止操作",{title:false}, function(index){ + _doAgreeApply(); + layer.close(index); + }); + } else { + layer.confirm('【提示】点击确认后，审批即撤回', { + btn: ['确认','取消'], + title:false + }, function(){ + _doAgreeApply(); + }); - function _doAgreeApply(){ - //执行 - $.ajax({ - type: "POST", - url: "{:U('verifyReturn')}", - dataType: 'json', - async: false, - data: {ids:text}, - success:function(data){ - if(data.status==1){ - layer.msg("" + data.info + ""); - setTimeout(function(){ - window.location.reload(); - },1500); - }else{ - layer.msg("" + data.info + ""); - return false; + function _doAgreeApply(){ + //执行 + $.ajax({ + type: "POST", + url: "{:U('verifyReturn')}", + dataType: 'json', + async: false, + data: {ids:text}, + success:function(data){ + if(data.status==1){ + layer.msg("" + data.info + ""); + setTimeout(function(){ + window.location.reload(); + },1500); + }else{ + layer.msg("" + data.info + ""); + return false; + } } - } - }); + }); + } } + + }); $("#export").click(function () { From dcd730fbe07e95d9d522937eb92c2d682a9ca347 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 25 Sep 2020 14:21:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=81=9A=E5=90=88=E5=85=AC=E5=8F=B8?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/CompanyStatementPool/lists.html | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/Application/Admin/View/CompanyStatementPool/lists.html b/Application/Admin/View/CompanyStatementPool/lists.html index 36ad7be64..27e67b11f 100644 --- a/Application/Admin/View/CompanyStatementPool/lists.html +++ b/Application/Admin/View/CompanyStatementPool/lists.html @@ -423,27 +423,28 @@ _doAgreeApply(); }); - function _doAgreeApply(){ - //执行 - $.ajax({ - type: "POST", - url: "{:U('verifyReturn')}", - dataType: 'json', - async: false, - data: {ids:text}, - success:function(data){ - if(data.status==1){ - layer.msg("" + data.info + ""); - setTimeout(function(){ - window.location.reload(); - },1500); - }else{ - layer.msg("" + data.info + ""); - return false; - } + } + + function _doAgreeApply(){ + //执行 + $.ajax({ + type: "POST", + url: "{:U('verifyReturn')}", + dataType: 'json', + async: false, + data: {ids:text}, + success:function(data){ + if(data.status==1){ + layer.msg("" + data.info + ""); + setTimeout(function(){ + window.location.reload(); + },1500); + }else{ + layer.msg("" + data.info + ""); + return false; } - }); - } + } + }); } From cd9e82dfcbca3d3967ae84f348eca1509bca4070 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 25 Sep 2020 14:52:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B1=87=E6=80=BB=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B9=E4=BF=9D=E7=95=99=E4=B8=A4=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatementPool/editPuPool.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CompanyStatementPool/editPuPool.html b/Application/Admin/View/CompanyStatementPool/editPuPool.html index 56c719947..0fad3346f 100644 --- a/Application/Admin/View/CompanyStatementPool/editPuPool.html +++ b/Application/Admin/View/CompanyStatementPool/editPuPool.html @@ -463,7 +463,7 @@ get_item = get_item.next(); } - _parent.find(".statement_money").text(sum_amount); + _parent.find(".statement_money").text(sum_amount.toFixed(2)); } //结算金额合计重算 function changeSumAmount() {