Merge branch 'feature/pay'

webht/third_party/pay/controllers/AlipayTradeService.php

@@ -537,15 +537,15 @@ class AlipayTradeService extends CI_Controller
         $parent_note = $this->Alipay_note_model->note($parent_trade_no);
         // APP 组的退款查不到原始收款记录 todo
         if (empty($parent_note) ) { # && true === $this->Alipay_note_model->if_APP_order($parent_order) ) {
-            // $parent_note = $parent_payment;
+            $parent_note = $item;
             // 补充字段
             // $parent_note->IPL_orderId = $parent_order . '_B';
             // $parent_note->IPL_currencyCode = $parent_payment->currencyCode;
             // $parent_note->IPL_payerName = strval("''");
             // $parent_note->IPL_payerEmail = strval("''");
 
-            $this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail');
-            return false;
+            // $this->Alipay_note_model->update_send($item->ALI_dealId, 'sendfail');
+            // return false;
         }
         //订单号
         $orderid_info = analysis_orderid($parent_note->ALI_orderId);
@@ -876,6 +876,7 @@ class AlipayTradeService extends CI_Controller
                 ,'TRADE_SUCCESS'
                 ,NULL
                 ,$row['buyer_user_name']
+                ,null,true
             );
         }
         return;

webht/third_party/pay/models/Alipay_note_model.php

@@ -89,8 +89,15 @@ class Alipay_note_model extends CI_Model {
      * @author LYT <lyt@hainatravel.com>
      * @date   2017-08-29
      */
-    public function save_alipay($ALI_dealId,$ALI_orderId,$ALI_currencyCode,$ALI_orderAmount,$ALI_payAmount,$ALI_stateCode,$ALI_acquiringTime,$ALI_completeTime,$ALI_memo,$ALI_payType,$ALI_resultCode=null,$ALI_resultMsg=null,$ALI_payerName=null,$ALI_payerEmail=NULL) {
-        $sql = "
+    public function save_alipay($ALI_dealId,$ALI_orderId,$ALI_currencyCode,$ALI_orderAmount,$ALI_payAmount,$ALI_stateCode,$ALI_acquiringTime,$ALI_completeTime,$ALI_memo,$ALI_payType,$ALI_resultCode=null,$ALI_resultMsg=null,$ALI_payerName=null,$ALI_payerEmail=NULL, $check_exists=false) {
+        $sql = $check_exists===false ? "" : "
+            IF NOT EXISTS(
+                SELECT TOP 1 1
+                FROM   AlipayLog
+                WHERE  ALI_dealId = '$ALI_dealId'
+            )
+        ";
+        $sql .= "
                 INSERT INTO AlipayLog
                   (
                       ALI_dealId,ALI_orderId,ALI_currencyCode,ALI_orderAmount,ALI_payAmount,ALI_stateCode,ALI_acquiringTime,ALI_completeTime,ALI_memo,ALI_sent,ALI_noticeTime,ALI_payType,ALI_resultCode,ALI_resultMsg,ALI_payerName,ALI_payerEmail