diff --git a/src_sql/procedure/proc_insert_hexiao.sql b/src_sql/procedure/proc_insert_hexiao.sql index 4fc7c4a43..613318714 100644 --- a/src_sql/procedure/proc_insert_hexiao.sql +++ b/src_sql/procedure/proc_insert_hexiao.sql @@ -71,17 +71,21 @@ BEGIN ca.acc_number, ca.bank_name, ca.account, - '光大银行', - '安鹏国际融资租赁(深圳)有限公司', - '35230188000138484', + oa.acc_bank, + lci.subjectname, + oa.acc_number, 'AutoBuckle' FROM LC_RENT_PLAN O, VI_LC_RENT_PLAN vl LEFT JOIN customer_account ca ON ca.contract_id=vl.contract_id + LEFT JOIN lb_contract_info lci ON vl.contract_id=lci.id + LEFT JOIN code_library cl ON cl.codeno='ManySubject' AND lci.subjectid=cl.itemno + LEFT JOIN own_account oa ON oa.own_id=cl.bankno AND account_purpose='default' AND state_='0010' AND (account_type='in_account' OR account_type='inAndOut_account') WHERE O.id = vl.id AND vl.contract_id =ln_contract_id - AND vl.plan_date = ln_plan_date ) ; + AND vl.plan_date = ln_plan_date + GROUP BY oa.own_id) ; -- in_type = 2为银联卡口手动刷新核销数据 ELSEIF in_type = 2 THEN INSERT INTO LC_RENT_INCOME ( @@ -159,17 +163,21 @@ CASE WHEN in_rent>=vl.corpus_over+vl.interest_over+vl.penalty_over THEN vl.int ca.acc_number, ca.bank_name, ca.account, - '光大银行', - '安鹏国际融资租赁(深圳)有限公司', - '35230188000138484', + oa.acc_bank, + lci.subjectname, + oa.acc_number, 'AutoBuckle' FROM LC_RENT_PLAN O, VI_LC_RENT_PLAN vl LEFT JOIN customer_account ca ON ca.contract_id=vl.contract_id -WHERE O.id = vl.id - AND vl.contract_id = ln_contract_id - AND vl.plan_date = ln_plan_date ) ; + LEFT JOIN lb_contract_info lci ON vl.contract_id=lci.id + LEFT JOIN code_library cl ON cl.codeno='ManySubject' AND lci.subjectid=cl.itemno + LEFT JOIN own_account oa ON oa.own_id=cl.bankno AND account_purpose='default' AND state_='0010' AND (account_type='in_account' OR account_type='inAndOut_account') + WHERE O.id = vl.id + AND vl.contract_id =ln_contract_id + AND vl.plan_date = ln_plan_date + GROUP BY oa.own_id) ; -- 如果in_type=3就是经销商保证金代偿,in_hire_list为核销罚息金额 ELSEIF in_type = 3 THEN @@ -232,18 +240,23 @@ WHERE O.id = vl.id ca.acc_number, ca.bank_name, ca.account, - '光大银行', - '安鹏国际融资租赁(深圳)有限公司', - '35230188000138484', + oa.acc_bank, + lci.subjectname, + oa.acc_number, 'AutoBuckle' FROM LC_RENT_PLAN O, VI_LC_RENT_PLAN vl LEFT JOIN customer_account ca ON ca.contract_id=vl.contract_id + LEFT JOIN lb_contract_info lci ON vl.contract_id=lci.id + LEFT JOIN code_library cl ON cl.codeno='ManySubject' AND lci.subjectid=cl.itemno + LEFT JOIN own_account oa ON oa.own_id=cl.bankno AND account_purpose='default' AND state_='0010' AND (account_type='in_account' OR account_type='inAndOut_account') WHERE O.id = vl.id AND vl.contract_id =ln_contract_id - AND vl.plan_date = ln_plan_date ) ; - -- in_type = 4 为微信还款 hire_list 固定为1,微信只允许一期还全部金额 + AND vl.plan_date = ln_plan_date + GROUP BY oa.own_id ) ; + + -- in_type = 4 为微信还款 ELSEIF in_type = 4 THEN INSERT INTO LC_RENT_INCOME ( ID, diff --git a/src_sql/view/vi_chargebackvouchertotal.sql b/src_sql/view/vi_chargebackvouchertotal.sql index dc318f583..7057faf0f 100644 --- a/src_sql/view/vi_chargebackvouchertotal.sql +++ b/src_sql/view/vi_chargebackvouchertotal.sql @@ -1,36 +1,34 @@ DELIMITER $$ -ALTER ALGORITHM=UNDEFINED DEFINER=`apzl`@`%` SQL SECURITY DEFINER VIEW `apzl`.`vi_chargebackvouchertotal` AS +ALTER ALGORITHM=UNDEFINED DEFINER=`apzl`@`%` SQL SECURITY DEFINER VIEW `vi_chargebackvouchertotal` AS SELECT `lrp`.`ID` AS `id`, `lsc`.`SUBJECTS_CODE` AS `subjects_code`, `lri`.`OWN_NUMBER` AS `own_number`, `lrp`.`COLLECT_STATUS` AS `COLLECT_STATUS`, - `oi`.`OWN_NAME` AS `OWN_NAME`, + `lri`.`own_account` AS `OWN_NAME`, `lri`.`SPARE_BATCH_NO` AS `SPARE_BATCH_NO`, `lri`.`SPARE_BATCH_NO` AS `SPARE_BATCH_NO_DATA`, - lri.`charge_way` AS `CHANNEL`, + `lri`.`charge_way` AS `CHANNEL`, `lri`.`HIRE_DATE` AS `HIRE_DATE`, `vss`.`ACHIEVED_DATE` AS `ACHIEVED_DATE`, `lri`.`OWN_BANK` AS `OWN_BANK`, (SUM(`lri`.`RENT`) + SUM(`lri`.`PENALTY`)) AS `CHARGEBACK_MONEY_S`, COUNT(`lri`.`CONTRACT_ID`) AS `CHARGEBACK_QTY_S`, (CASE WHEN (ISNULL(`vs`.`CHARGEBACK_STATUS`) OR (`vs`.`CHARGEBACK_STATUS` = '')) THEN '未核销' ELSE '核销成功' END) AS `CHARGEBACK_STATUS` -FROM ((((((`apzl`.`lc_rent_plan` `lrp` - LEFT JOIN `apzl`.`lc_rent_income` `lri` +FROM ((((((`lc_rent_plan` `lrp` + LEFT JOIN `lc_rent_income` `lri` ON (((`lri`.`CONTRACT_ID` = `lrp`.`CONTRACT_ID`) - AND (`lri`.`PLAN_LIST` = `lrp`.`PLAN_LIST`)))) - LEFT JOIN `apzl`.`own_account` `oa` - ON ((`lri`.`OWN_NUMBER` = `oa`.`acc_number`))) - LEFT JOIN `apzl`.`own_info` `oi` - ON ((`oa`.`own_id` = `oi`.`OWN_NUMBER`))) - LEFT JOIN `apzl`.`verificationspare` `vs` + AND (`lri`.`PLAN_LIST` = `lrp`.`PLAN_LIST`)))))) + LEFT JOIN own_account oa ON lri.own_number=oa.acc_number + LEFT JOIN `verificationspare` `vs` ON ((`vs`.`SPARE_BATCH_NO` = CONVERT(`lri`.`SPARE_BATCH_NO` USING utf8)))) - LEFT JOIN `apzl`.`lv_stacts_config` `lsc` + LEFT JOIN `lv_stacts_config` `lsc` ON ((`lsc`.`ID` = `oa`.`acc_title`))) - LEFT JOIN `apzl`.`verificationspare` `vss` + LEFT JOIN `verificationspare` `vss` ON ((`vss`.`SPARE_BATCH_NO` = CONVERT(`lri`.`SPARE_BATCH_NO` USING utf8)))) -WHERE (lri.CHARGE_WAY='AutoBuckle' OR lri.CHARGE_WAY='WXUnionPay') -GROUP BY `lri`.`HIRE_DATE`,`lri`.`OWN_NUMBER`,`lri`.`CHARGE_WAY` $$ +WHERE ((`lri`.`charge_way` = 'AutoBuckle') + OR (`lri`.`charge_way` = 'WXUnionPay')) +GROUP BY `lri`.`own_account`,`lri`.`HIRE_DATE`,`lri`.`OWN_NUMBER`,`lri`.`charge_way`$$ DELIMITER ; \ No newline at end of file