From d660e1da297c99b37bb57c6962565af15cd56f15 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 14 Apr 2020 16:46:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BB=9F=E8=AE=A1=E7=9A=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=A4=B1=E5=AF=BC=E8=87=B4=E8=A1=A8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9C=AA=E5=90=88=E5=B9=B6;=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E9=80=80=E6=AC=BE=E9=80=9A=E7=9F=A5=E6=94=B6=E4=BB=B6?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/PaymentService.php | 4 ++-- webht/third_party/pay/models/Online_payment_note_model.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index e10dbe22..ecaf6f39 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -599,8 +599,8 @@ class PaymentService extends CI_Controller { } $fromName = 'refund imported'; $fromEmail = ''; - $toName = 'fgy'; - $toEmail = 'fgy@hainatravel.com'; + $toName = 'huangyi'; // 'fgy'; + $toEmail = 'hyi@hainatravel.com'; // 'fgy@hainatravel.com'; $subject = $filename; $body = "导入账单后有退款, 已汇总到文件.
文件生成日期:". date("Y-m-d H:i"). ".
下载链接: https://www.mycht.cn/download_statement/refund/" . $filename . ".xls"; $M_AddTime = $time_set; diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php index f0f3b65f..3080a673 100644 --- a/webht/third_party/pay/models/Online_payment_note_model.php +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -353,7 +353,7 @@ class Online_payment_note_model extends CI_Model { WHERE OPN_completeTime BETWEEN @from_date_last_year AND @to_date_last_year and OPN_noticeType=@type GROUP BY OPN_accountMethod - ) as year_cmp on method.OPN_accountMethod=year_cmp.year_method + ) as year_cmp on isnull(method.OPN_accountMethod,cmp.last_method)=year_cmp.year_method full join ( SELECT OPN_accountMethod this_year_method ,SUM( @@ -372,7 +372,7 @@ class Online_payment_note_model extends CI_Model { WHERE OPN_completeTime BETWEEN @this_year AND @to_date and OPN_noticeType=@type GROUP BY OPN_accountMethod - ) as this_year_cmp on method.OPN_accountMethod=this_year_cmp.this_year_method + ) as this_year_cmp on isnull(method.OPN_accountMethod,cmp.last_method)=this_year_cmp.this_year_method ) AS cal "; // var_dump($this->info->query($sql)); // 无法输出结果集