diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index f01b1bff..9ab617e5 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -670,7 +670,7 @@ class PaymentService extends CI_Controller { $data['gai_info'] = $this->account_model->get_money_t($pn_txn_id); if ( ! empty($data['gai_info'])) { $old_ssje = $data['gai_info'][0]->GAI_SSJE; - $this->account_model->delete_money_t($pn_txn_id); + $this->account_model->delete_money_t($pn_txn_id, $data['gai_info']->GAI_SN); } } elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'TP' || $orderid_info->ordertype === 'A' @@ -678,7 +678,7 @@ class PaymentService extends CI_Controller { $data['gai_info'] = $this->account_model->get_money_b($pn_txn_id); if ( ! empty($data['gai_info'])) { $old_ssje = $data['gai_info'][0]->GAI_SSJE; - $this->account_model->delete_money_b($pn_txn_id); + $this->account_model->delete_money_b($pn_txn_id, $data['gai_info']->GAI_SN); } } } diff --git a/webht/third_party/pay/models/Online_payment_account_model.php b/webht/third_party/pay/models/Online_payment_account_model.php index 5cc8d397..bd02eb4b 100644 --- a/webht/third_party/pay/models/Online_payment_account_model.php +++ b/webht/third_party/pay/models/Online_payment_account_model.php @@ -307,16 +307,16 @@ class Online_payment_account_model extends CI_Model { return $result; } /** 删除收款记录 */ - public function delete_money_t($deadId) + public function delete_money_t($deadId, $gai_sn) { - $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?"; - $query = $this->HT->query($sql, array($deadId)); + $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=? and GAI_SN=?"; + $query = $this->HT->query($sql, array($deadId, $gai_sn)); return $query; } - public function delete_money_b($deadId) + public function delete_money_b($deadId, $gai_sn) { - $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?"; - $query = $this->HT->query($sql, array($deadId)); + $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=? and GAI_SN=?"; + $query = $this->HT->query($sql, array($deadId, $gai_sn)); return $query; } diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index ce38bb1b..454ef789 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -2166,13 +2166,13 @@ class Index extends CI_Controller { $data['gai_info'] = $this->Paypal_model->get_money_t($pn_txn_id); if ( ! empty($data['gai_info'])) { $old_ssje = $data['gai_info'][0]->GAI_SSJE; - $this->Paypal_model->delete_money_t($pn_txn_id); + $this->Paypal_model->delete_money_t($pn_txn_id, $data['gai_info']->GAI_SN); } } elseif ($orderid_info->ordertype === 'B') { $data['gai_info'] = $this->Paypal_model->get_money_b($pn_txn_id); if ( ! empty($data['gai_info'])) { $old_ssje = $data['gai_info'][0]->GAI_SSJE; - $this->Paypal_model->delete_money_b($pn_txn_id); + $this->Paypal_model->delete_money_b($pn_txn_id, $data['gai_info']->GAI_SN); } } elseif ($orderid_info->ordertype === 'A') { $this->send_note($pn_txn_id); diff --git a/webht/third_party/paypal/models/paypal_model.php b/webht/third_party/paypal/models/paypal_model.php index 93fa4dd9..f1d9a02d 100644 --- a/webht/third_party/paypal/models/paypal_model.php +++ b/webht/third_party/paypal/models/paypal_model.php @@ -662,16 +662,16 @@ class Paypal_model extends CI_Model { return $result; } /** 删除收款记录 */ - public function delete_money_t($deadId) + public function delete_money_t($deadId, $gai_sn) { - $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=?"; - $query = $this->HT->query($sql, array($deadId)); + $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=? and GAI_SN=?"; + $query = $this->HT->query($sql, array($deadId, $gai_sn)); return $query; } - public function delete_money_b($deadId) + public function delete_money_b($deadId, $gai_sn) { - $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=?"; - $query = $this->HT->query($sql, array($deadId)); + $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1, LastEditTime=GETDATE(), GAI_Memo='删除 '+GAI_Memo WHERE GAI_AccreditNo=? and GAI_SN=?"; + $query = $this->HT->query($sql, array($deadId, $gai_sn)); return $query; }