Merge branch 'feature/pay'

webht/third_party/pay/controllers/iPayLinksService.php

@@ -604,7 +604,7 @@ class IPayLinksService extends CI_Controller
         // APP 组的退款查不到原始收款记录
         $pure_orderid = strstr($parent_order,"_",true);
         $pure_orderid = $pure_orderid===false ? $parent_order : $pure_orderid;
-        if (empty($parent_note) && true === $this->IPayLinks_model->if_APP_order($pure_orderid) ) {
+        if (true === $this->IPayLinks_model->if_APP_order($pure_orderid) ) {
             $parent_note = $parent_payment;
             // 补充字段
             $parent_note->IPL_orderId = $parent_order . '_B';
@@ -903,12 +903,13 @@ class IPayLinksService extends CI_Controller
         bcscale(2);
         /** 退款成功 */
         if (isset($asyns_resp->data->refundOrderId) && strcmp($asyns_resp->data->resultCode, '2') == 0) {
+            $notice_time = $asyns_resp->data->completeTime=='' ? time() : strtotime($asyns_resp->data->completeTime);
             $this->Note_model->save_refund(
                 strval($asyns_resp->data->dealId)
                 , strval($asyns_resp->data->orderId)
                 , strval("-" . bcdiv(floatval($asyns_resp->data->refundAmount), 100))
                 , strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->refundTime)))
-                , strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->completeTime)))
+                , strval(date('Y-m-d H:i:s',$notice_time))
                 , $asyns_resp->data->resultCode
                 , null
                 , json_encode($asyns_resp->data)