郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 68729e2a7c824d085bc74efed09ac0df1474ecd0 1 个父辈 650204b9
1 个管道 的构建 通过 耗费 0 秒

修改订单

内嵌 并排对比
正在显示 2 个修改的文件 包含 29 行增加 和 29 行删除
... ... @@ -89,8 +89,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="300">
<caret line="704" column="39" lean-forward="true" selection-start-line="704" selection-start-column="39" selection-end-line="704" selection-end-column="39" />
<state relative-caret-position="286">
<caret line="783" column="26" lean-forward="true" selection-start-line="783" selection-start-column="26" selection-end-line="783" selection-end-column="26" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
... ... @@ -115,14 +115,14 @@
<element signature="e#26803#27196#0#PHP" expanded="false" />
<element signature="e#27223#30701#0#PHP" expanded="false" />
<element signature="e#30730#33635#0#PHP" expanded="false" />
<element signature="e#34556#35875#0#PHP" expanded="false" />
<element signature="e#35896#39401#0#PHP" expanded="false" />
<element signature="e#39449#39551#0#PHP" expanded="false" />
<element signature="e#40141#47313#0#PHP" expanded="false" />
<element signature="e#42407#46128#0#PHP" expanded="false" />
<element signature="e#46184#46294#0#PHP" expanded="false" />
<element signature="e#46570#46639#0#PHP" expanded="false" />
<element signature="e#47336#47553#0#PHP" expanded="false" />
<element signature="e#34478#35838#0#PHP" expanded="false" />
<element signature="e#35859#39405#0#PHP" expanded="false" />
<element signature="e#39453#39555#0#PHP" expanded="false" />
<element signature="e#40145#47317#0#PHP" expanded="false" />
<element signature="e#42411#46132#0#PHP" expanded="false" />
<element signature="e#46188#46298#0#PHP" expanded="false" />
<element signature="e#46574#46643#0#PHP" expanded="false" />
<element signature="e#47340#47557#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -216,8 +216,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="31" />
<option name="y" value="54" />
<option name="x" value="336" />
<option name="y" value="69" />
<option name="width" value="1871" />
<option name="height" value="1007" />
</component>
... ... @@ -340,7 +340,7 @@
<workItem from="1575541798312" duration="2359000" />
<workItem from="1575592025964" duration="640000" />
<workItem from="1575599624364" duration="95000" />
<workItem from="1575680867057" duration="22728000" />
<workItem from="1575680867057" duration="23167000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -353,7 +353,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="332627000" />
<option name="totallyTimeSpent" value="333066000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -365,7 +365,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="31" y="54" width="1871" height="1007" extended-state="0" />
<frame x="336" y="69" width="1871" height="1007" extended-state="0" />
<editor active="true" />
<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.17669795" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -418,7 +418,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="16" />
<option name="time" value="17" />
</breakpoint-manager>
<watches-manager />
</component>
... ... @@ -858,7 +858,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/runtime/log/201912/07.log">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1206">
<state relative-caret-position="-11298">
<caret line="10" column="9" lean-forward="true" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
<folding />
</state>
... ... @@ -866,8 +866,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="704" column="39" lean-forward="true" selection-start-line="704" selection-start-column="39" selection-end-line="704" selection-end-column="39" />
<state relative-caret-position="286">
<caret line="783" column="26" lean-forward="true" selection-start-line="783" selection-start-column="26" selection-end-line="783" selection-end-column="26" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
... ... @@ -892,14 +892,14 @@
<element signature="e#26803#27196#0#PHP" expanded="false" />
<element signature="e#27223#30701#0#PHP" expanded="false" />
<element signature="e#30730#33635#0#PHP" expanded="false" />
<element signature="e#34556#35875#0#PHP" expanded="false" />
<element signature="e#35896#39401#0#PHP" expanded="false" />
<element signature="e#39449#39551#0#PHP" expanded="false" />
<element signature="e#40141#47313#0#PHP" expanded="false" />
<element signature="e#42407#46128#0#PHP" expanded="false" />
<element signature="e#46184#46294#0#PHP" expanded="false" />
<element signature="e#46570#46639#0#PHP" expanded="false" />
<element signature="e#47336#47553#0#PHP" expanded="false" />
<element signature="e#34478#35838#0#PHP" expanded="false" />
<element signature="e#35859#39405#0#PHP" expanded="false" />
<element signature="e#39453#39555#0#PHP" expanded="false" />
<element signature="e#40145#47317#0#PHP" expanded="false" />
<element signature="e#42411#46132#0#PHP" expanded="false" />
<element signature="e#46188#46298#0#PHP" expanded="false" />
<element signature="e#46574#46643#0#PHP" expanded="false" />
<element signature="e#47340#47557#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -701,10 +701,9 @@ class Pay extends Api
//查询该用户信息以及是否为会员身份
$user = Db::name('user')->where('id',$data['user_id'])->find();
$mobile = $user['mobile'];
Log::info($user);
Log::info($mobile);
$str = "【仁甲看见】";
if(!empty($pic_id)){
Log::info('郭盛');
//将购买次数加1
foreach ($pic_id as $key => $v){
//非会员
... ... @@ -726,6 +725,7 @@ class Pay extends Api
}
}
if(!empty($video_id)){
Log::info('郭晨');
//判断是否为会员
if($user['is_vip'] == 0){
//不是会员的情况
... ...