郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 e34abce49c0f7888cf06d3c1bc54b50efd51803e 1 个父辈 170ffb33
1 个管道 的构建 通过 耗费 1 秒

修改订单

内嵌 并排对比
正在显示 3 个修改的文件 包含 147 行增加 和 150 行删除
... ... @@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -17,8 +16,8 @@
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="608" column="5" lean-forward="true" selection-start-line="608" selection-start-column="5" selection-end-line="608" selection-end-column="5" />
<state relative-caret-position="444">
<caret line="545" column="40" lean-forward="false" selection-start-line="545" selection-start-column="40" selection-end-line="545" selection-end-column="40" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#574#693#0#PHP" expanded="false" />
... ... @@ -31,24 +30,24 @@
<element signature="e#7569#7857#0#PHP" expanded="false" />
<element signature="e#7934#8207#0#PHP" expanded="false" />
<element signature="e#9276#10320#0#PHP" expanded="false" />
<element signature="e#13247#13544#0#PHP" expanded="false" />
<element signature="e#13550#13943#0#PHP" expanded="false" />
<element signature="e#13949#14369#0#PHP" expanded="false" />
<element signature="e#14374#21670#0#PHP" expanded="false" />
<element signature="e#16008#16296#0#PHP" expanded="false" />
<element signature="e#16372#16645#0#PHP" expanded="false" />
<element signature="e#16800#17110#0#PHP" expanded="false" />
<element signature="e#17185#17636#0#PHP" expanded="false" />
<element signature="e#17713#18757#0#PHP" expanded="false" />
<element signature="e#18851#18969#0#PHP" expanded="false" />
<element signature="e#21697#25124#0#PHP" expanded="false" />
<element signature="e#25154#28055#0#PHP" expanded="false" />
<element signature="e#28084#31534#0#PHP" expanded="false" />
<element signature="e#28960#29565#0#PHP" expanded="false" />
<element signature="e#29586#31023#0#PHP" expanded="false" />
<element signature="e#31071#31173#0#PHP" expanded="false" />
<element signature="e#31563#35300#0#PHP" expanded="false" />
<element signature="e#35323#35540#0#PHP" expanded="false" />
<element signature="e#13236#13656#0#PHP" expanded="false" />
<element signature="e#13661#20957#0#PHP" expanded="false" />
<element signature="e#15295#15583#0#PHP" expanded="false" />
<element signature="e#15659#15932#0#PHP" expanded="false" />
<element signature="e#16087#16397#0#PHP" expanded="false" />
<element signature="e#16472#16923#0#PHP" expanded="false" />
<element signature="e#17000#18044#0#PHP" expanded="false" />
<element signature="e#18138#18256#0#PHP" expanded="false" />
<element signature="e#20974#21271#0#PHP" expanded="false" />
<element signature="e#21276#21669#0#PHP" expanded="false" />
<element signature="e#21696#25174#0#PHP" expanded="false" />
<element signature="e#25203#28108#0#PHP" expanded="false" />
<element signature="e#28137#31587#0#PHP" expanded="false" />
<element signature="e#29013#29618#0#PHP" expanded="false" />
<element signature="e#29639#31076#0#PHP" expanded="false" />
<element signature="e#31124#31226#0#PHP" expanded="false" />
<element signature="e#31616#35353#0#PHP" expanded="false" />
<element signature="e#35376#35593#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -140,7 +139,7 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="320" />
<option name="y" value="82" />
<option name="width" value="1399" />
... ... @@ -265,7 +264,7 @@
<workItem from="1574814989178" duration="1007000" />
<workItem from="1574831367903" duration="17171000" />
<workItem from="1574849431656" duration="8641000" />
<workItem from="1574900416229" duration="810000" />
<workItem from="1574900416229" duration="2167000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -278,7 +277,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="280279000" />
<option name="totallyTimeSpent" value="281636000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -290,17 +289,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<frame x="320" y="82" width="1399" height="945" extended-state="1" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13752665" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1926811" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11969532" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11881188" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -684,8 +682,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="608" column="5" lean-forward="true" selection-start-line="608" selection-start-column="5" selection-end-line="608" selection-end-column="5" />
<state relative-caret-position="444">
<caret line="545" column="40" lean-forward="false" selection-start-line="545" selection-start-column="40" selection-end-line="545" selection-end-column="40" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#574#693#0#PHP" expanded="false" />
... ... @@ -698,24 +696,24 @@
<element signature="e#7569#7857#0#PHP" expanded="false" />
<element signature="e#7934#8207#0#PHP" expanded="false" />
<element signature="e#9276#10320#0#PHP" expanded="false" />
<element signature="e#13247#13544#0#PHP" expanded="false" />
<element signature="e#13550#13943#0#PHP" expanded="false" />
<element signature="e#13949#14369#0#PHP" expanded="false" />
<element signature="e#14374#21670#0#PHP" expanded="false" />
<element signature="e#16008#16296#0#PHP" expanded="false" />
<element signature="e#16372#16645#0#PHP" expanded="false" />
<element signature="e#16800#17110#0#PHP" expanded="false" />
<element signature="e#17185#17636#0#PHP" expanded="false" />
<element signature="e#17713#18757#0#PHP" expanded="false" />
<element signature="e#18851#18969#0#PHP" expanded="false" />
<element signature="e#21697#25124#0#PHP" expanded="false" />
<element signature="e#25154#28055#0#PHP" expanded="false" />
<element signature="e#28084#31534#0#PHP" expanded="false" />
<element signature="e#28960#29565#0#PHP" expanded="false" />
<element signature="e#29586#31023#0#PHP" expanded="false" />
<element signature="e#31071#31173#0#PHP" expanded="false" />
<element signature="e#31563#35300#0#PHP" expanded="false" />
<element signature="e#35323#35540#0#PHP" expanded="false" />
<element signature="e#13236#13656#0#PHP" expanded="false" />
<element signature="e#13661#20957#0#PHP" expanded="false" />
<element signature="e#15295#15583#0#PHP" expanded="false" />
<element signature="e#15659#15932#0#PHP" expanded="false" />
<element signature="e#16087#16397#0#PHP" expanded="false" />
<element signature="e#16472#16923#0#PHP" expanded="false" />
<element signature="e#17000#18044#0#PHP" expanded="false" />
<element signature="e#18138#18256#0#PHP" expanded="false" />
<element signature="e#20974#21271#0#PHP" expanded="false" />
<element signature="e#21276#21669#0#PHP" expanded="false" />
<element signature="e#21696#25174#0#PHP" expanded="false" />
<element signature="e#25203#28108#0#PHP" expanded="false" />
<element signature="e#28137#31587#0#PHP" expanded="false" />
<element signature="e#29013#29618#0#PHP" expanded="false" />
<element signature="e#29639#31076#0#PHP" expanded="false" />
<element signature="e#31124#31226#0#PHP" expanded="false" />
<element signature="e#31616#35353#0#PHP" expanded="false" />
<element signature="e#35376#35593#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -293,30 +293,6 @@ class Pay extends Api
}
}
//发送短信
public function sms($mobile,$content){
$note = array(
'content' => $content,//短信内容
'mobile' => $mobile,//手机号码
'productid' => '887361',//产品id
'xh' => ''//小号
);
$result = $this->send_sms($note);
return $result;
}
function send_sms($data){
//todo 短信账号密码
// require_once EXTEND_PATH . 'nsms/nsms.php';
$url = "http://www.ztsms.cn/sendNSms.do";
$username = 'hangpai';
$password = 'Cxz307312';
$sendAPI = new nsms($url, $username, $password);
$sendAPI->data = $data;/*初始化数据包*/
$return = $sendAPI->sendSMS('POST');
return $return;
}
/**
* @ApiTitle (视频购买支付)
* @ApiSummary (视频购买支付)
... ... @@ -467,6 +443,29 @@ class Pay extends Api
}
}
//发送短信
public function sms($mobile,$content){
$note = array(
'content' => $content,//短信内容
'mobile' => $mobile,//手机号码
'productid' => '887361',//产品id
'xh' => ''//小号
);
$result = $this->send_sms($note);
return $result;
}
function send_sms($data){
//todo 短信账号密码
// require_once EXTEND_PATH . 'nsms/nsms.php';
$url = "http://www.ztsms.cn/sendNSms.do";
$username = 'hangpai';
$password = 'Cxz307312';
$sendAPI = new nsms($url, $username, $password);
$sendAPI->data = $data;/*初始化数据包*/
$return = $sendAPI->sendSMS('POST');
return $return;
}
//支付订单结果通知（无需调用）
public function payOrderNotify(){
$config = config('verify.wx_pay');
... ... @@ -492,7 +491,7 @@ class Pay extends Api
$res = Db::name('toporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
//判断用户是否已经是会员了
if($arr['is_vip'] == 0){
if($arr['is_vip'] == 1){
//已经是会员
$list['money'] = $arr['money'] + $money;
$info = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$list['money']]);
... ... @@ -524,6 +523,7 @@ class Pay extends Api
// 提交事务
Db::commit();
}
$this->success('SUCCESS');
} catch (\Exception $e) {
dump($e->getMessage());
// 回滚事务
... ... @@ -542,7 +542,6 @@ class Pay extends Api
$response->send();
}
//支付开通会员结果通知（无需调用）
public function vippayOrderNotify(){
$config = config('verify.wx_pay');
... ... @@ -588,13 +587,13 @@ class Pay extends Api
// 提交事务
Db::commit();
}
$this->success('SUCCESS','支付成功');
} catch (\Exception $e) {
dump($e->getMessage());
// 回滚事务
Db::rollback();
$this->error(['code'=>2,'msg'=>'开通会员失败']);
}
$this->success('SUCCESS','支付成功');
}else{
//支付失败
Db::name('viporder')->where('num',$message['out_trade_no'])->update(['status'=>1]);
... ...
... ... @@ -153,9 +153,9 @@
<a href="javascript:;" data-id="3" class="list-group-item">充值支付</a>
<a href="javascript:;" data-id="4" class="list-group-item">开通会员支付</a>
<a href="javascript:;" data-id="5" class="list-group-item">图片购买支付</a>
<a href="javascript:;" data-id="6" class="list-group-item"></a>
<a href="javascript:;" data-id="6" class="list-group-item">视频购买支付</a>
<a href="javascript:;" data-id="7" class="list-group-item"></a>
<a href="javascript:;" data-id="8" class="list-group-item">视频购买支付</a>
<a href="javascript:;" data-id="8" class="list-group-item"></a>
<a href="javascript:;" data-id="9" class="list-group-item"></a>
<a href="javascript:;" data-id="10" class="list-group-item"></a>
<a href="javascript:;" data-id="11" class="list-group-item"></a>
... ... @@ -970,8 +970,8 @@
<div class="panel panel-default">
<div class="panel-heading" id="heading-6">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion6" href="#collapseOne6"> <span class="text-muted">/api/pay/sms</span></a>
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion6" href="#collapseOne6"> 视频购买支付 <span class="text-muted">/api/pay/videopay</span></a>
</h4>
</div>
<div id="collapseOne6" class="panel-collapse collapse">
... ... @@ -989,17 +989,57 @@
<div class="tab-pane active" id="info6">
<div class="well">
</div>
视频购买支付 </div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
无
<table class="table table-hover">
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>必选</th>
<th>描述</th>
</tr>
</thead>
<tbody>
<tr>
<td>token</td>
<td>string</td>
<td>是</td>
<td>请求的Token</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
无
<table class="table table-hover">
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>必选</th>
<th>描述</th>
</tr>
</thead>
<tbody>
<tr>
<td>order_id</td>
<td>inter</td>
<td>是</td>
<td>订单id</td>
</tr>
<tr>
<td>type</td>
<td>inter</td>
<td>是</td>
<td>支付方式 1 为余额支付 2为微信支付</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="panel panel-default">
... ... @@ -1013,11 +1053,27 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
<div class="headers">
<div class="form-group">
<label class="control-label" for="token">token</label>
<input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/sms" method="get" name="form6" id="form6">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/videopay" method="POST" name="form6" id="form6">
<div class="form-group">
无
<label class="control-label" for="order_id">order_id</label>
<input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
</div>
<div class="form-group">
<label class="control-label" for="type">type</label>
<input type="inter" class="form-control input-sm" id="type" required placeholder="支付方式 1 为余额支付 2为微信支付" name="type">
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="6">提交</button>
... ... @@ -1063,7 +1119,7 @@
<div class="panel-heading" id="heading-7">
<h4 class="panel-title">
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion7" href="#collapseOne7"> <span class="text-muted">/api/pay/send_sms</span></a>
<a data-toggle="collapse" data-parent="#accordion7" href="#collapseOne7"> <span class="text-muted">/api/pay/sms</span></a>
</h4>
</div>
<div id="collapseOne7" class="panel-collapse collapse">
... ... @@ -1107,7 +1163,7 @@
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/send_sms" method="get" name="form7" id="form7">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/sms" method="get" name="form7" id="form7">
<div class="form-group">
无
</div>
... ... @@ -1154,8 +1210,8 @@
<div class="panel panel-default">
<div class="panel-heading" id="heading-8">
<h4 class="panel-title">
<span class="label label-primary">POST</span>
<a data-toggle="collapse" data-parent="#accordion8" href="#collapseOne8"> 视频购买支付 <span class="text-muted">/api/pay/videopay</span></a>
<span class="label label-success">GET</span>
<a data-toggle="collapse" data-parent="#accordion8" href="#collapseOne8"> <span class="text-muted">/api/pay/send_sms</span></a>
</h4>
</div>
<div id="collapseOne8" class="panel-collapse collapse">
... ... @@ -1173,57 +1229,17 @@
<div class="tab-pane active" id="info8">
<div class="well">
视频购买支付 </div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
<table class="table table-hover">
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>必选</th>
<th>描述</th>
</tr>
</thead>
<tbody>
<tr>
<td>token</td>
<td>string</td>
<td>是</td>
<td>请求的Token</td>
</tr>
</tbody>
</table>
无
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<table class="table table-hover">
<thead>
<tr>
<th>名称</th>
<th>类型</th>
<th>必选</th>
<th>描述</th>
</tr>
</thead>
<tbody>
<tr>
<td>order_id</td>
<td>inter</td>
<td>是</td>
<td>订单id</td>
</tr>
<tr>
<td>type</td>
<td>inter</td>
<td>是</td>
<td>支付方式 1 为余额支付 2为微信支付</td>
</tr>
</tbody>
</table>
无
</div>
</div>
<div class="panel panel-default">
... ... @@ -1237,27 +1253,11 @@
<div class="row">
<div class="col-md-12">
<div class="panel panel-default">
<div class="panel-heading"><strong>Headers</strong></div>
<div class="panel-body">
<div class="headers">
<div class="form-group">
<label class="control-label" for="token">token</label>
<input type="string" class="form-control input-sm" id="token" required placeholder="请求的Token - Ex: " name="token">
</div>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>参数</strong></div>
<div class="panel-body">
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/videopay" method="POST" name="form8" id="form8">
<div class="form-group">
<label class="control-label" for="order_id">order_id</label>
<input type="inter" class="form-control input-sm" id="order_id" required placeholder="订单id" name="order_id">
</div>
<form enctype="application/x-www-form-urlencoded" role="form" action="/api/pay/send_sms" method="get" name="form8" id="form8">
<div class="form-group">
<label class="control-label" for="type">type</label>
<input type="inter" class="form-control input-sm" id="type" required placeholder="支付方式 1 为余额支付 2为微信支付" name="type">
无
</div>
<div class="form-group">
<button type="submit" class="btn btn-success send" rel="8">提交</button>
... ... @@ -6482,7 +6482,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-27 20:25:16 </div>
Generated on 2019-11-28 08:57:59 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...