elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/add_item' of 47.111.118.107:wmtx/platform into feature/add_item

Browse Source
master
chenzhi 4 years ago
parent f22dc90e96 cd9e82dfcb
commit 6c03a64405
3 changed files with 145 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
Application/Admin/View/CompanyStatementPool/editPuPool.html
Unescape Escape View File

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

20
Application/Admin/View/CompanyStatementPool/lists.html
Unescape Escape View File

@ -389,9 +389,15 @@
});
$("#verifyReturn").on("click",function(){
var status = false;
var text = $("input:checkbox[name='ids[]']:checked").map(function(index,elem) {
console.log($(elem).data("status"))
if($(elem).data("status") == 1 || $(elem).data("status") == -1){
return $(elem).val();
} else {
status = true;
}
}).get();
if(text.length > 40){
@ -399,11 +405,17 @@
return;
}
if(text.length < 1){
layer.msg("<font style='color:white'>" + '无需要汇总的操作'+"</font>");
layer.msg("<font style='color:white'>" + '无需要审批撤回的操作'+"</font>");
return;
}
text = text.join(",");
if (status) {
layer.confirm("审批撤回仅会对【'审批通过','审批拒绝'】的申请进行处理，选择中包含其他的状态的申请将被忽略，点击取消停止操作",{title:false}, function(index){
_doAgreeApply();
layer.close(index);
});
} else {
layer.confirm('【提示】点击确认后，审批即撤回', {
btn: ['确认','取消'],
title:false
@ -411,6 +423,8 @@
_doAgreeApply();
});
}
function _doAgreeApply(){
//执行
$.ajax({
@ -432,6 +446,8 @@
}
});
}
});
$("#export").click(function () {

118
Data/update.sql
Unescape Escape View File

@ -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`;
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;
Write Preview
Loading…
Cancel
Save