郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 89e0716e1280347330edaa3d7750ed75a6b8a2d5 1 个父辈 5ae1f8d7
1 个管道 的构建 通过 耗费 6 秒

开通会员支付

内嵌 并排对比
正在显示 4 个修改的文件 包含 116 行增加 和 110 行删除
... ... @@ -2,7 +2,10 @@
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -13,11 +16,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="769" column="25" lean-forward="false" selection-start-line="769" selection-start-column="25" selection-end-line="769" selection-end-column="25" />
<state relative-caret-position="650">
<caret line="527" column="29" lean-forward="true" selection-start-line="527" selection-start-column="29" selection-end-line="527" selection-end-column="29" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -38,60 +41,61 @@
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18229#0#PHP" expanded="false" />
<element signature="e#18235#18612#0#PHP" expanded="false" />
<element signature="e#18617#18881#0#PHP" expanded="false" />
<element signature="e#18887#19392#0#PHP" expanded="false" />
<element signature="e#19397#19648#0#PHP" expanded="false" />
<element signature="e#19654#20133#0#PHP" expanded="false" />
<element signature="e#20138#20895#0#PHP" expanded="false" />
<element signature="e#20901#21382#0#PHP" expanded="false" />
<element signature="e#21387#22157#0#PHP" expanded="false" />
<element signature="e#22163#22526#0#PHP" expanded="false" />
<element signature="e#22531#22722#0#PHP" expanded="false" />
<element signature="e#22728#23086#0#PHP" expanded="false" />
<element signature="e#23091#23281#0#PHP" expanded="false" />
<element signature="e#23287#24430#0#PHP" expanded="false" />
<element signature="e#24435#27100#0#PHP" expanded="false" />
<element signature="e#27106#27604#0#PHP" expanded="false" />
<element signature="e#27609#28696#0#PHP" expanded="false" />
<element signature="e#28702#29115#0#PHP" expanded="false" />
<element signature="e#29120#29599#0#PHP" expanded="false" />
<element signature="e#29605#30139#0#PHP" expanded="false" />
<element signature="e#30144#31058#0#PHP" expanded="false" />
<element signature="e#31064#31595#0#PHP" expanded="false" />
<element signature="e#31600#32519#0#PHP" expanded="false" />
<element signature="e#32525#33174#0#PHP" expanded="false" />
<element signature="e#33179#34052#0#PHP" expanded="false" />
<element signature="e#34058#34478#0#PHP" expanded="false" />
<element signature="e#34483#34966#0#PHP" expanded="false" />
<element signature="e#34972#35567#0#PHP" expanded="false" />
<element signature="e#35572#40221#0#PHP" expanded="false" />
<element signature="e#40227#40793#0#PHP" expanded="false" />
<element signature="e#40798#42904#0#PHP" expanded="false" />
<element signature="e#18289#18666#0#PHP" expanded="false" />
<element signature="e#18671#18935#0#PHP" expanded="false" />
<element signature="e#18941#19446#0#PHP" expanded="false" />
<element signature="e#19451#19702#0#PHP" expanded="false" />
<element signature="e#19708#20187#0#PHP" expanded="false" />
<element signature="e#20192#20949#0#PHP" expanded="false" />
<element signature="e#20955#21436#0#PHP" expanded="false" />
<element signature="e#21441#22211#0#PHP" expanded="false" />
<element signature="e#22217#22580#0#PHP" expanded="false" />
<element signature="e#22585#22776#0#PHP" expanded="false" />
<element signature="e#22782#23140#0#PHP" expanded="false" />
<element signature="e#23145#23335#0#PHP" expanded="false" />
<element signature="e#23341#24484#0#PHP" expanded="false" />
<element signature="e#24489#27154#0#PHP" expanded="false" />
<element signature="e#27160#27658#0#PHP" expanded="false" />
<element signature="e#27663#28750#0#PHP" expanded="false" />
<element signature="e#28756#29169#0#PHP" expanded="false" />
<element signature="e#29174#29653#0#PHP" expanded="false" />
<element signature="e#29659#30193#0#PHP" expanded="false" />
<element signature="e#30198#31112#0#PHP" expanded="false" />
<element signature="e#31118#31649#0#PHP" expanded="false" />
<element signature="e#31654#32573#0#PHP" expanded="false" />
<element signature="e#32579#33228#0#PHP" expanded="false" />
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
<element signature="e#35026#35621#0#PHP" expanded="false" />
<element signature="e#35626#40275#0#PHP" expanded="false" />
<element signature="e#40281#40847#0#PHP" expanded="false" />
<element signature="e#40852#42958#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="462" column="25" lean-forward="true" selection-start-line="462" selection-start-column="25" selection-end-line="462" selection-end-column="25" />
<state relative-caret-position="344">
<caret line="332" column="0" lean-forward="true" selection-start-line="332" selection-start-column="0" selection-end-line="332" selection-end-column="0" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13874#0#PHP" expanded="false" />
<element signature="e#13901#17603#0#PHP" expanded="false" />
<element signature="e#20597#21427#0#PHP" expanded="false" />
<element signature="e#21456#22289#0#PHP" expanded="false" />
<element signature="e#22312#22529#0#PHP" expanded="false" />
<element signature="e#17633#20577#0#PHP" expanded="false" />
<element signature="e#20606#21436#0#PHP" expanded="false" />
<element signature="e#21465#22298#0#PHP" expanded="false" />
<element signature="e#22321#22538#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -151,8 +155,8 @@
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -171,8 +175,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="325" />
<option name="y" value="50" />
<option name="x" value="373" />
<option name="y" value="55" />
<option name="width" value="1699" />
<option name="height" value="1003" />
</component>
... ... @@ -268,7 +272,8 @@
<workItem from="1574209189943" duration="37638000" />
<workItem from="1574252363848" duration="8841000" />
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1329000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="1403000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -281,7 +286,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="139919000" />
<option name="totallyTimeSpent" value="141343000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -293,9 +298,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="325" y="50" width="1699" height="1003" extended-state="0" />
<frame x="373" y="55" width="1699" height="1003" extended-state="0" />
<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.15436241" 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.1561928" 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" />
... ... @@ -674,10 +679,33 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
<caret line="332" column="0" lean-forward="true" selection-start-line="332" selection-start-column="0" selection-end-line="332" selection-end-column="0" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13874#0#PHP" expanded="false" />
<element signature="e#13901#17603#0#PHP" expanded="false" />
<element signature="e#17633#20577#0#PHP" expanded="false" />
<element signature="e#20606#21436#0#PHP" expanded="false" />
<element signature="e#21465#22298#0#PHP" expanded="false" />
<element signature="e#22321#22538#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="769" column="25" lean-forward="false" selection-start-line="769" selection-start-column="25" selection-end-line="769" selection-end-column="25" />
<state relative-caret-position="650">
<caret line="527" column="29" lean-forward="true" selection-start-line="527" selection-start-column="29" selection-end-line="527" selection-end-column="29" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#337#456#0#PHP" expanded="false" />
... ... @@ -698,58 +726,36 @@
<element signature="e#12775#13459#0#PHP" expanded="false" />
<element signature="e#13464#15254#0#PHP" expanded="false" />
<element signature="e#15260#16130#0#PHP" expanded="false" />
<element signature="e#16135#18229#0#PHP" expanded="false" />
<element signature="e#18235#18612#0#PHP" expanded="false" />
<element signature="e#18617#18881#0#PHP" expanded="false" />
<element signature="e#18887#19392#0#PHP" expanded="false" />
<element signature="e#19397#19648#0#PHP" expanded="false" />
<element signature="e#19654#20133#0#PHP" expanded="false" />
<element signature="e#20138#20895#0#PHP" expanded="false" />
<element signature="e#20901#21382#0#PHP" expanded="false" />
<element signature="e#21387#22157#0#PHP" expanded="false" />
<element signature="e#22163#22526#0#PHP" expanded="false" />
<element signature="e#22531#22722#0#PHP" expanded="false" />
<element signature="e#22728#23086#0#PHP" expanded="false" />
<element signature="e#23091#23281#0#PHP" expanded="false" />
<element signature="e#23287#24430#0#PHP" expanded="false" />
<element signature="e#24435#27100#0#PHP" expanded="false" />
<element signature="e#27106#27604#0#PHP" expanded="false" />
<element signature="e#27609#28696#0#PHP" expanded="false" />
<element signature="e#28702#29115#0#PHP" expanded="false" />
<element signature="e#29120#29599#0#PHP" expanded="false" />
<element signature="e#29605#30139#0#PHP" expanded="false" />
<element signature="e#30144#31058#0#PHP" expanded="false" />
<element signature="e#31064#31595#0#PHP" expanded="false" />
<element signature="e#31600#32519#0#PHP" expanded="false" />
<element signature="e#32525#33174#0#PHP" expanded="false" />
<element signature="e#33179#34052#0#PHP" expanded="false" />
<element signature="e#34058#34478#0#PHP" expanded="false" />
<element signature="e#34483#34966#0#PHP" expanded="false" />
<element signature="e#34972#35567#0#PHP" expanded="false" />
<element signature="e#35572#40221#0#PHP" expanded="false" />
<element signature="e#40227#40793#0#PHP" expanded="false" />
<element signature="e#40798#42904#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="462" column="25" lean-forward="true" selection-start-line="462" selection-start-column="25" selection-end-line="462" selection-end-column="25" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13874#0#PHP" expanded="false" />
<element signature="e#13901#17603#0#PHP" expanded="false" />
<element signature="e#20597#21427#0#PHP" expanded="false" />
<element signature="e#21456#22289#0#PHP" expanded="false" />
<element signature="e#22312#22529#0#PHP" expanded="false" />
<element signature="e#18289#18666#0#PHP" expanded="false" />
<element signature="e#18671#18935#0#PHP" expanded="false" />
<element signature="e#18941#19446#0#PHP" expanded="false" />
<element signature="e#19451#19702#0#PHP" expanded="false" />
<element signature="e#19708#20187#0#PHP" expanded="false" />
<element signature="e#20192#20949#0#PHP" expanded="false" />
<element signature="e#20955#21436#0#PHP" expanded="false" />
<element signature="e#21441#22211#0#PHP" expanded="false" />
<element signature="e#22217#22580#0#PHP" expanded="false" />
<element signature="e#22585#22776#0#PHP" expanded="false" />
<element signature="e#22782#23140#0#PHP" expanded="false" />
<element signature="e#23145#23335#0#PHP" expanded="false" />
<element signature="e#23341#24484#0#PHP" expanded="false" />
<element signature="e#24489#27154#0#PHP" expanded="false" />
<element signature="e#27160#27658#0#PHP" expanded="false" />
<element signature="e#27663#28750#0#PHP" expanded="false" />
<element signature="e#28756#29169#0#PHP" expanded="false" />
<element signature="e#29174#29653#0#PHP" expanded="false" />
<element signature="e#29659#30193#0#PHP" expanded="false" />
<element signature="e#30198#31112#0#PHP" expanded="false" />
<element signature="e#31118#31649#0#PHP" expanded="false" />
<element signature="e#31654#32573#0#PHP" expanded="false" />
<element signature="e#32579#33228#0#PHP" expanded="false" />
<element signature="e#33233#34106#0#PHP" expanded="false" />
<element signature="e#34112#34532#0#PHP" expanded="false" />
<element signature="e#34537#35020#0#PHP" expanded="false" />
<element signature="e#35026#35621#0#PHP" expanded="false" />
<element signature="e#35626#40275#0#PHP" expanded="false" />
<element signature="e#40281#40847#0#PHP" expanded="false" />
<element signature="e#40852#42958#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -434,7 +434,7 @@ class Pay extends Api
//判断用户充值金额是否大于等于8000
if($data['money']>=8000){
//大于等于的情况
$res = Db::name('toporder')->where('num',$message['out_trade_no'])->update($toporder);
$res = Db::name('viporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
//不是会员
$list['money'] = $arr['money'] + $money;
... ... @@ -443,20 +443,18 @@ class Pay extends Api
if($res && $info){
true;
}else{
$this->error(['code'=>2,'msg'=>'充值失败']);
$this->error(['code'=>2,'msg'=>'开通会员失败']);
}
// 提交事务
Db::commit();
}else{
//小于8000的情况
$res = Db::name('toporder')->where('num',$message['out_trade_no'])->update($toporder);
$res = Db::name('viporder')->where('num',$message['out_trade_no'])->update($toporder);
$arr = Db::name('user')->where('id',$data['user_id'])->find();
$list['money'] = $arr['money'] + $money;
$info = Db::name('user')->where('id',$data['user_id'])->update(['money'=>$list['money']]);
if($res && $info){
true;
}else{
$this->error(['code'=>2,'msg'=>'充值失败']);
}
// 提交事务
Db::commit();
... ... @@ -466,9 +464,11 @@ class Pay extends Api
// 回滚事务
Db::rollback();
}
$this->success('SUCCESS','支付成功');
}else{
//支付失败
Db::name('toporder')->where('num',$message['out_trade_no'])->update(['status'=>1]);
Db::name('viporder')->where('num',$message['out_trade_no'])->update(['status'=>1]);
$this->error(['code'=>2,'msg'=>'支付失败']);
}
}else{
return $fail('通信失败，请稍后再通知我');
... ...
... ... @@ -502,7 +502,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,content')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,eight_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ... @@ -522,7 +522,7 @@ class User extends Api
$this->error(['code'=>2,'msg'=>'缺少必要参数']);
}
$data = Db::name('video')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,content')
->field('id,title,thumbnail,video,price,four_price,eight_price,water_url,two_url,four_url,eight_url,content')
->where('id',$pic_id)
->find();
if(empty($data)){
... ...
... ... @@ -5182,7 +5182,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-11-21 20:11:25 </div>
Generated on 2019-11-22 08:49:30 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...