Merge branch 'feature/pay'

7 years ago · ecfbc1c0cf
parent 706809d978 445676d267
commit ecfbc1c0cf
1 changed files with 2 additions and 2 deletions
--- a/webht/third_party/pay/controllers/AlipayTradeService.php
+++ b/webht/third_party/pay/controllers/AlipayTradeService.php
@ -641,10 +641,10 @@ class AlipayTradeService extends CI_Controller
            $this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail');
            return false;
        }
-
+        $send_email = ($item->ALI_completeTime>date('Y-m-d', strtotime("-1 day")));
        //添加邮件发送记录
        // if (true) { // test
-        if ($item->ALI_sent !== 'send' && substr($item->ALI_sent, 0, 5) !== 'send-') {
+        if ($send_email===true && $item->ALI_sent !== 'send' && substr($item->ALI_sent, 0, 5) !== 'send-') {
            // 客人邮件中的外联落款
            // $web_code = 'cht'; // 默认cht
            $web_lgc = 1;