zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: zm:774dc7263535fce43d532b991932ffa11ee9ee8d
Branches Tags
zm:master
...
compare: zm:ef62e8e7d0a342d48ae0939edf201f83231d19cb
Branches Tags
zm:master

2 Commits
774dc72635 ... ef62e8e7d0

Author SHA1 Message Date
wangjinlei
ef62e8e7d0 Merge remote-tracking branch 'origin/master' 2025-11-27 16:32:07 +08:00
wangjinlei
01293220ef 支付bug 2025-11-27 16:32:03 +08:00
2 changed files with 23 additions and 13 deletions
Expand all files Collapse all files

18
application/api/controller/Order.php
View File

@@ -92,12 +92,12 @@ class Order extends base{
$paystation_info = $this->paystation_obj->where("ps_id",$order_info['ps_id'])->find(); $paystation_info = $this->paystation_obj->where("ps_id",$order_info['ps_id'])->find();
$response = paystationLookup($paystation_info["merchant_session"]); $response = paystationLookup($paystation_info["merchant_session"]);
$res = xml_to_array($response); $res = xml_to_array($response);
if(isset($res['PaystationQuickLookup']['LookupResponse']['Authentication']['auth_Status'])&&$res['PaystationQuickLookup']['LookupResponse']['Authentication']['auth_Status']=="Y"){ if(isset($res['PaystationQuickLookup']['LookupResponse']['PaystationErrorMessage'])&&$res['PaystationQuickLookup']['LookupResponse']['PaystationErrorMessage']=="Transaction successful"&&$res['PaystationQuickLookup']['LookupResponse']['PaystationErrorCode']==0){
$this->article_obj->where("article_id",$order_info['article_id'])->update(['is_buy'=>1]); $this->article_obj->where("article_id",$order_info['article_id'])->update(['is_buy'=>1]);
$this->order_obj->where("order_id",$order_info['order_id'])->update(['state'=>1]); $this->order_obj->where("order_id",$order_info['order_id'])->update(['state'=>1]);
return jsonSuccess(["result"=>"success","paystation"=>$paystation_info]); return jsonSuccess(["result"=>"success","paystation"=>$paystation_info]);
}else{ }else{
return jsonSuccess(['result'=>"fail"]); return jsonSuccess(['result'=>"fail","msg"=> $res['PaystationQuickLookup']['LookupResponse']['PaystationErrorMessage'] ?? "no message"]);
} }
} }
@@ -134,12 +134,10 @@ class Order extends base{
$response = curl_exec($ch); $response = curl_exec($ch);
if(curl_errno($ch)) { if(curl_errno($ch)) {
echo 'Error:' . curl_error($ch); echo 'Error:' . curl_error($ch);
} else {
echo "Response: " . $response;
} }
curl_close($ch); curl_close($ch);
return jsonSuccess($response); return jsonSuccess(xml_to_array($response));
} }
@@ -382,6 +380,16 @@ class Order extends base{
$article_info = $this->article_obj->where("article_id",$data['article_id'])->find(); $article_info = $this->article_obj->where("article_id",$data['article_id'])->find();
$journal_info = $this->journal_obj->where("journal_id",$article_info['journal_id'])->find(); $journal_info = $this->journal_obj->where("journal_id",$article_info['journal_id'])->find();
$user_info = $this->user_obj->where("user_id",$article_info['user_id'])->find(); $user_info = $this->user_obj->where("user_id",$article_info['user_id'])->find();
$order_info = $this->order_obj->where("article_id",$article_info['article_id'])->find();
if($order_info&$order_info['state']==0&&$order_info['ps_id']>0){
$paystation = $this->paystation_obj->where("ps_id",$order_info['ps_id'])->find();
$res = xml_to_array(paystationLookup($paystation['merchant_session']));
if(isset($res['PaystationQuickLookup']['LookupResponse']['PaystationErrorMessage'])&&$res['PaystationQuickLookup']['LookupResponse']['PaystationErrorMessage']=="Transaction successful"&&$res['PaystationQuickLookup']['LookupResponse']['PaystationErrorCode']==0){
$this->article_obj->where("article_id",$order_info['article_id'])->update(['is_buy'=>1]);
$this->order_obj->where("order_id",$order_info['order_id'])->update(['state'=>1]);
$article_info = $this->article_obj->where("article_id",$data['article_id'])->find();
}
}
$re['article_detail'] = $article_info; $re['article_detail'] = $article_info;
$re['journal_detail'] = $journal_info; $re['journal_detail'] = $journal_info;
$re['user_detail'] = $user_info; $re['user_detail'] = $user_info;

18
application/api/controller/Preaccept.php
View File

@@ -756,14 +756,16 @@ class Preaccept extends Base
$article_info = $this->article_obj->where("article_id",$data['article_id'])->find(); $article_info = $this->article_obj->where("article_id",$data['article_id'])->find();
$journal_info = $this->journal_obj->where("journal_id",$article_info['journal_id'])->find(); $journal_info = $this->journal_obj->where("journal_id",$article_info['journal_id'])->find();
$order_info = $this->order_obj->where("article_id",$article_info['article_id'])->find(); $order_info = $this->order_obj->where("article_id",$article_info['article_id'])->find();
$paystation = $this->paystation_obj->where("ps_id",$order_info['ps_id'])->find(); if($order_info){
$order_info['paystation'] = $paystation; $paystation = $this->paystation_obj->where("ps_id",$order_info['ps_id'])->find();
if($order_info['state']==0){ $order_info['paystation'] = $paystation;
$res = xml_to_array(paystationLookup($paystation['merchant_session'])); if($order_info['state']==0){
if(isset($res['PaystationQuickLookup']['LookupResponse']['Authentication']['auth_Status'])&&$res['PaystationQuickLookup']['LookupResponse']['Authentication']['auth_Status']=="Y"){ $res = xml_to_array(paystationLookup($paystation['merchant_session']));
$this->article_obj->where("article_id",$order_info['article_id'])->update(['is_buy'=>1]); if(isset($res['PaystationQuickLookup']['LookupResponse']['PaystationErrorMessage'])&&$res['PaystationQuickLookup']['LookupResponse']['PaystationErrorMessage']=="Transaction successful"&&$res['PaystationQuickLookup']['LookupResponse']['PaystationErrorCode']==0){
$this->order_obj->where("order_id",$order_info['order_id'])->update(['state'=>1]); $this->article_obj->where("article_id",$order_info['article_id'])->update(['is_buy'=>1]);
$article_info = $this->article_obj->where("article_id",$data['article_id'])->find(); $this->order_obj->where("order_id",$order_info['order_id'])->update(['state'=>1]);
$article_info = $this->article_obj->where("article_id",$data['article_id'])->find();
}
} }
} }
$re['state'] = $article_info['is_buy']; $re['state'] = $article_info['is_buy'];