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)); // 无法输出结果集