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

商旅组订单:任何状态收款后都修改为新订单(已支付),重复处理通知的不修改

Browse Source
feature/trippest
lyt 7 years ago
parent b3ce832bb6
commit 35e95ae11b
6 changed files with 82 additions and 19 deletions
Show Stats Download Patch File Download Diff File

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

@ -386,6 +386,10 @@ class AlipayTradeService extends CI_Controller
// $this->Alipay_model->update_biz_coli_state($GAI_COLI_SN, 8); //把订单状态改为已付款
// }
} else {
// 把订单状态设置为13-新订单已支付
if (false == $this->Alipay_model->if_biz_gai_exists($item->ALI_dealId) ) {
$this->Alipay_model->update_biz_coli_state($GAI_COLI_SN, 13);
}
$this->Alipay_model->add_account_info(
$GAI_COLI_SN,
$advisor_info->COLI_ID,
@ -403,8 +407,6 @@ class AlipayTradeService extends CI_Controller
);
// 更新订单主表付款方式,防止没访问thankyou-train.asp
$this->Alipay_model->update_paymanner($GAI_COLI_SN);
// 把订单状态设置为13-新订单已支付
$this->Alipay_model->update_biz_coli_state($GAI_COLI_SN, 13);
}
}
//更新还没有填的客邮和交易号de收款记录（传统订单）

6
webht/third_party/pay/controllers/iPayLinksService.php vendored
Unescape Escape View File

@ -463,6 +463,10 @@ class IPayLinksService extends CI_Controller
// $this->IPayLinks_model->update_biz_coli_state($GAI_COLI_SN, 13); //把订单状态改为已付款
// }
} else {
// 把订单状态设置为13-新订单已支付
if (false == $this->IPayLinks_model->if_biz_gai_exists($item->IPL_dealId) ) {
$this->IPayLinks_model->update_biz_coli_state($GAI_COLI_SN, 13);
}
$this->IPayLinks_model->add_account_info(
$GAI_COLI_SN,
$advisor_info->COLI_ID,
@ -478,8 +482,6 @@ class IPayLinksService extends CI_Controller
$item->IPL_dealId,
$ht_memo
);
// 把订单状态设置为13-新订单已支付
$this->IPayLinks_model->update_biz_coli_state($GAI_COLI_SN, 13);
// 更新订单主表付款方式,防止没访问thankyou-train.asp
if (empty($advisor_info->COLI_PayManner)) {
$this->IPayLinks_model->update_paymanner($GAI_COLI_SN);

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

@ -121,14 +121,33 @@ class Alipay_model extends CI_Model {
//修改订单状态
public function update_biz_coli_state($coli_sn, $coli_state) {
$sql = "
IF EXISTS
( SELECT OPI_DEI_SN
FROM OperatorInfo
INNER JOIN BIZ_ConfirmLineInfo ON OPI_SN=COLI_OPI_ID
WHERE COLI_SN=? AND OPI_DEI_SN=10
)
UPDATE BIZ_ConfirmLineInfo
SET COLI_State=?
WHERE COLI_SN = ? AND COLI_State in (0,1,11,12,13,14,40,50,60,101,102,999)
WHERE COLI_SN=?
ELSE
UPDATE BIZ_ConfirmLineInfo
SET COLI_State=? WHERE COLI_SN=?
AND COLI_State IN (0,1,11,12,13,14,40,50,60,101,102,999)
";
$query = $this->HT->query($sql, array($coli_state, $coli_sn));
$query = $this->HT->query($sql, array($coli_sn, $coli_state, $coli_sn, $coli_state, $coli_sn));
return $query;
}
public function if_biz_gai_exists($GAI_AccreditNo)
{
$sql = " SELECT TOP 1 1 FROM BIZ_GroupAccountInfo
WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%')
AND DeleteFlag=0";
$result = $this->HT->query($sql, array($GAI_AccreditNo));
return ($result->num_rows() > 0);
}
//添加收款记录(商务订单),APP会自动增加记录，所以添加前根据金额来判断是否有重复记录
public function add_account_info_forAPP($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) {
//先判断是否有这条数据

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

@ -121,14 +121,33 @@ class IPayLinks_model extends CI_Model {
//修改订单状态
public function update_biz_coli_state($coli_sn, $coli_state) {
$sql = "
IF EXISTS
( SELECT OPI_DEI_SN
FROM OperatorInfo
INNER JOIN BIZ_ConfirmLineInfo ON OPI_SN=COLI_OPI_ID
WHERE COLI_SN=? AND OPI_DEI_SN=10
)
UPDATE BIZ_ConfirmLineInfo
SET COLI_State=?
WHERE COLI_SN = ? and COLI_State in (0,1,11,12,13,14,40,50,60,101,102,999)
WHERE COLI_SN=?
ELSE
UPDATE BIZ_ConfirmLineInfo
SET COLI_State=? WHERE COLI_SN=?
AND COLI_State IN (0,1,11,12,13,14,40,50,60,101,102,999)
";
$query = $this->HT->query($sql, array($coli_state, $coli_sn));
$query = $this->HT->query($sql, array($coli_sn, $coli_state, $coli_sn, $coli_state, $coli_sn));
return $query;
}
public function if_biz_gai_exists($GAI_AccreditNo)
{
$sql = " SELECT TOP 1 1 FROM BIZ_GroupAccountInfo
WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%')
AND DeleteFlag=0";
$result = $this->HT->query($sql, array($GAI_AccreditNo));
return ($result->num_rows() > 0);
}
//添加收款记录(商务订单),APP会自动增加记录，所以添加前根据金额来判断是否有重复记录
public function add_account_info_forAPP($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) {
//先判断是否有这条数据

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

@ -812,15 +812,17 @@ class Index extends CI_Controller {
$ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency));
$this->Paypal_model->add_account_info_forAPP($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo);
if ($advisor_info->COLI_WebCode == 'CHTAPP' && $advisor_info->COLI_State == 11) { //只修改APP组的订单状态，并且订单进度是我的订单
$this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 8); //把订单状态改为已付款
$this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 13); //把订单状态改为已付款
}
} else {
// 把订单状态设置为13-新订单已支付
if (false == $this->Paypal_model->if_biz_gai_exists($item->pn_txn_id) ) {
$this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 13);
}
$ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency));
$this->Paypal_model->add_account_info($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo);
// 更新订单主表付款方式,防止没访问thankyou-train.asp
$this->Paypal_model->update_paymanner($GAI_COLI_SN, '15010');
// 把订单状态设置为13-新订单已支付
$this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 13);
}
}
//更新还没有填的客邮和交易号de收款记录（传统订单）

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

@ -122,14 +122,33 @@ class Paypal_model extends CI_Model {
//修改订单状态
public function update_biz_coli_state($coli_sn, $coli_state) {
$sql = "
IF EXISTS
( SELECT OPI_DEI_SN
FROM OperatorInfo
INNER JOIN BIZ_ConfirmLineInfo ON OPI_SN=COLI_OPI_ID
WHERE COLI_SN=? AND OPI_DEI_SN=10
)
UPDATE BIZ_ConfirmLineInfo
SET COLI_State=?
WHERE COLI_SN = ? AND COLI_State in (0,1,11,12,13,14,40,50,60,101,102,999)
WHERE COLI_SN=?
ELSE
UPDATE BIZ_ConfirmLineInfo
SET COLI_State=? WHERE COLI_SN=?
AND COLI_State IN (0,1,11,12,13,14,40,50,60,101,102,999)
";
$query = $this->HT->query($sql, array($coli_state, $coli_sn));
$query = $this->HT->query($sql, array($coli_sn, $coli_state, $coli_sn, $coli_state, $coli_sn));
return $query;
}
public function if_biz_gai_exists($GAI_AccreditNo)
{
$sql = " SELECT TOP 1 1 FROM BIZ_GroupAccountInfo
WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%')
AND DeleteFlag=0";
$result = $this->HT->query($sql, array($GAI_AccreditNo));
return ($result->num_rows() > 0);
}
//添加收款记录(商务订单),APP会自动增加记录，所以添加前根据金额来判断是否有重复记录
public function add_account_info_forAPP($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) {
//先判断是否有这条数据

Write Preview
Loading…
Cancel
Save