Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

完成 PayPal、微信、支付宝收款审核提示

Browse Source
hotfix/paypal-note
LiaoYijun 4 years ago
parent 539f6454eb
commit 0cf26c5600
9 changed files with 112 additions and 6 deletions
Show Stats Download Patch File Download Diff File

3
webht/third_party/pay/controllers/AlipayTradeService.php vendored
Unescape Escape View File

@ -1107,6 +1107,9 @@ class AlipayTradeService extends CI_Controller
}
}
$data["paytext"] = $this->payment_status();
$order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN;
$data['group_accout_info'] =
$this->Alipay_model->get_group_accout_info($order_sn, $data['note']->ALI_dealId);
echo json_encode($this->load->view('alipay_note_setting', $data, true));
}

3
webht/third_party/pay/controllers/PaymentService.php vendored
Unescape Escape View File

@ -462,6 +462,9 @@ class PaymentService extends CI_Controller {
$data['order_info'] = $this->account_model->get_order($neworder_id->orderid, true, $neworder_id->ordertype, true);
}
}
$order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN;
$data['group_accout_info'] =
$this->account_model->get_group_accout_info($order_sn, $pn_txn_id);
echo json_encode($this->load->view('payment_gai_setting', $data, true));
}

24
webht/third_party/pay/models/Alipay_model.php vendored
Unescape Escape View File

@ -81,6 +81,30 @@ class Alipay_model extends CI_Model {
return $result;
}
/**
* 查找付款记录，用于判断是否已经审核。
* 已经审核过得记录不能修改订单号。
*/
public function get_group_accout_info($coli_sn, $pn_txn_id) {
// select * from BIZ_GroupAccountInfo where GAI_COLI_SN = 559007281 and GAI_AccreditNo = '91R84932UM059045C'
$info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'
union
select GAI_SN, GAI_State from GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'";
$info_query = $this->HT->query($info_sql);
$info_result = $info_query->result();
$group_accout_info = array(
'GAI_SN' => 0,
'GAI_State' => 0
);
if (!empty($info_empty)) {
$group_accout_info = $info_result[0];
}
return $group_accout_info;
}
//获取收款记录(商务订单)
public function get_money_list($GAI_COLI_ID, $GAI_SQJE, $GAI_SQJECurrency) {
$sql = "SELECT GAI_SN,GAI_CusEmail,GAI_Memo

23
webht/third_party/pay/models/Online_payment_account_model.php vendored
Unescape Escape View File

@ -97,6 +97,29 @@ class Online_payment_account_model extends CI_Model {
return $result;
}
/**
* 查找付款记录，用于判断是否已经审核。
* 已经审核过得记录不能修改订单号。
*/
public function get_group_accout_info($coli_sn, $pn_txn_id) {
$info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'
union
select GAI_SN, GAI_State from GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'";
$info_query = $this->HT->query($info_sql);
$info_result = $info_query->result();
$group_accout_info = array(
'GAI_SN' => 0,
'GAI_State' => 0
);
if (!empty($info_empty)) {
$group_accout_info = $info_result[0];
}
return $group_accout_info;
}
public function if_biz_gai_exists($GAI_AccreditNo, $is_app=false, $coli_sn=null, $je=null, $type=null)
{
if ($is_app===true && $coli_sn!==null) {

11
webht/third_party/pay/views/alipay_note_setting.php vendored
Unescape Escape View File

@ -33,10 +33,19 @@
<dl class="dl-horizontal">
<div class="input-group">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php //echo!empty($ALI_orderId) ? $ALI_orderId : $note->ALI_orderId; ?><?php echo !empty($new_order) ? $new_order : $old_order; ?>">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php //echo!empty($ALI_orderId) ? $ALI_orderId : $note->ALI_orderId; ?><?php echo !empty($new_order) ? $new_order : $old_order; ?>"
<?php
if ($group_accout_info['GAI_State'] > 0) { ?>
disabled="disabled"
<?php } ?>
>
<span class="input-group-addon search-btn" onclick="show_order_modal('<?php echo $note->ALI_dealId; ?>', $('#pn_invoice').val(),'<?php echo $note->ALI_noticeTime; ?>','<?php echo $note->ALI_orderId; ?>')"></span>
</div>
<label class="text-danger">订单号形如: 160414408_B , B商务订单，JJ160321052_T,T传统订单，请务必加上后缀</label>
<?php if ($group_accout_info['GAI_State'] > 0) { ?>
<label class="text-danger">此项记录财务已审核，请联系财务先取消收款审核。</label>
<?php } ?>
<div style='display: none'><?php var_dump($group_accout_info); ?></div>
</dl>
<dl class="dl-horizontal">

9
webht/third_party/pay/views/payment_gai_setting.php vendored
Unescape Escape View File

@ -31,10 +31,17 @@
</dl>
<?php } ?>
<div class="input-group">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($new_order) ? $new_order : $old_order; ?>" placeholder="输入订单号搜索匹配" >
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($new_order) ? $new_order : $old_order; ?>" placeholder="输入订单号搜索匹配"
<?php
if ($group_accout_info['GAI_State'] > 0) { ?>
disabled="disabled"
<?php } ?>
>
<span class="input-group-addon search-btn" onclick="show_gai_modal('<?php echo $note->OPN_SN; ?>', $('#pn_invoice').val())"></span>
</div>
<label class="text-danger">订单号形如: 160414408_B , B商务订单，JJ160321052_T,T传统订单，请务必加上后缀</label>
<div style='display: none'><?php var_dump($group_accout_info); ?></div>
<div style='display: none'><?php var_dump($order_info); ?></div>
<div>订单详细内容: </div>
<p>
<?php

8
webht/third_party/paypal/controllers/index.php vendored
Unescape Escape View File

@ -1285,12 +1285,16 @@ class Index extends CI_Controller {
$orderid_info = $this->analysis_orderid($pn_invoice);
} else {
$orderid_info = $this->analysis_orderid($data['note']->pn_invoice);
}
}
$data['pn_invoice'] = $pn_invoice ? $pn_invoice : $data['note']->pn_invoice;
if (!empty($orderid_info)) {
$orderid_info = json_decode($orderid_info);
$data['order_info'] = $this->Paypal_model->get_order($orderid_info->orderid, true, $orderid_info->ordertype);
}
$data['pn_invoice'] = $pn_invoice ? $pn_invoice : $data['note']->pn_invoice ;
$order_sn = empty($data['order_info']) ? 0 : $data['order_info']->COLI_SN;
$data['group_accout_info'] =
$this->Paypal_model->get_group_accout_info($order_sn, $data['note']->pn_txn_id);
echo json_encode($this->load->view('note_setting', $data, true));
return true;
}

24
webht/third_party/paypal/models/paypal_model.php vendored
Unescape Escape View File

@ -86,6 +86,30 @@ class Paypal_model extends CI_Model {
return $result;
}
/**
* 查找付款记录，用于判断是否已经审核。
* 已经审核过得记录不能修改订单号。
*/
public function get_group_accout_info($coli_sn, $pn_txn_id) {
// select * from BIZ_GroupAccountInfo where GAI_COLI_SN = 559007281 and GAI_AccreditNo = '91R84932UM059045C'
$info_sql = "select GAI_SN, GAI_State from BIZ_GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'
union
select GAI_SN, GAI_State from GroupAccountInfo
where GAI_COLI_SN = $coli_sn and GAI_AccreditNo = '$pn_txn_id'";
$info_query = $this->HT->query($info_sql);
$info_result = $info_query->result();
$group_accout_info = array(
'GAI_SN' => 0,
'GAI_State' => 0
);
if (!empty($info_empty)) {
$group_accout_info = $info_result[0];
}
return $group_accout_info;
}
//获取收款记录(商务订单)
public function get_money_list($GAI_COLI_ID, $GAI_SQJE=null, $GAI_SQJECurrency=null) {
$je_sql = $GAI_SQJE===null ? " " : " and GAI_SQJE=? ";

13
webht/third_party/paypal/views/note_setting.php vendored
Unescape Escape View File

@ -43,12 +43,21 @@
<dt>订单号</dt>
<dd>
<div class="input-group">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($pn_invoice) ? $pn_invoice : $note->pn_invoice; ?>">
<input type="text" class="form-control" id="pn_invoice" name="pn_invoice" value="<?php echo !empty($pn_invoice) ? $pn_invoice : $note->pn_invoice; ?>"
<?php
if ($group_accout_info['GAI_State'] > 0) { ?>
disabled="disabled"
<?php } ?>
>
<span class="input-group-btn">
<button class="btn btn-default" type="button" onclick="show_order_modal('<?php echo $note->pn_txn_id; ?>', 0, $('#pn_invoice').val())"><span class="glyphicon glyphicon-search"></span></button>
</span>
</div>
<label class="text-danger">订单号形如: 160414408_B , B商务订单，JJ160321052_T,T传统订单，请务必加上后缀</label>
<label class="text-danger">订单号形如: 160414408_B，B商务订单，JJ160321052_T，T传统订单，请务必加上后缀</label>
<?php if ($group_accout_info['GAI_State'] > 0) { ?>
<label class="text-danger">此项记录财务已审核，请联系财务先取消收款审核。</label>
<?php } ?>
<div style='display: none'><?php var_dump($group_accout_info); ?></div>
</dd>
</dl>

Write Preview
Loading…
Cancel
Save