Merge branch 'feature/pay'

webht/third_party/paypal/controllers/index.php

@@ -829,7 +829,7 @@ class Index extends CI_Controller {
             }
 
             //退款状态默认为已经处理，陆燕在退款前手动通知外联了，系统跳过处理
-            if (strtolower($item->pn_payment_status) == 'refunded') {
+            if (strtolower($item->pn_payment_status) == 'refunded' ) {
                 $this->send_refund($item, $handpick, $old_ssje);
                 // $this->Note_model->update_send($item->pn_txn_id, 'send');
                 continue;
@@ -846,6 +846,12 @@ class Index extends CI_Controller {
                 continue;
             }
 
+            // 状态=已完成 退款行为:撤销付款/拒付等
+            if (floatval($item->pn_mc_gross) < 0) {
+                $this->send_refund($item, $handpick, $old_ssje);
+                continue;
+            }
+
             //根据note信息找到订单号
             $get_order_no = $item->pn_invoice;
             $orderid_info = $this->analysis_orderid($item->pn_invoice);