郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 01c89cec7d159f3a245c5f3b47826375c6306728 1 个父辈 b365d613
1 个管道 的构建 通过 耗费 0 秒

修改订单

内嵌 并排对比
正在显示 2 个修改的文件 包含 21 行增加 和 20 行删除
... ... @@ -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="790" column="44" lean-forward="false" selection-start-line="790" selection-start-column="44" selection-end-line="790" selection-end-column="44" />
<state relative-caret-position="210">
<caret line="729" column="21" lean-forward="true" selection-start-line="729" selection-start-column="21" selection-end-line="729" selection-end-column="21" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
... ... @@ -113,10 +113,10 @@
<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#34685#35942#0#PHP" expanded="false" />
<element signature="e#35963#39469#0#PHP" expanded="false" />
<element signature="e#38043#38430#0#PHP" expanded="false" />
<element signature="e#40210#47382#0#PHP" expanded="false" />
<element signature="e#34685#35992#0#PHP" expanded="false" />
<element signature="e#36013#39569#0#PHP" expanded="false" />
<element signature="e#38093#38480#0#PHP" expanded="false" />
<element signature="e#40209#47381#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -209,9 +209,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="57" />
<option name="y" value="50" />
<component name="ProjectFrameBounds">
<option name="x" value="348" />
<option name="y" value="38" />
<option name="width" value="1871" />
<option name="height" value="997" />
</component>
... ... @@ -367,7 +367,7 @@
<workItem from="1575592025964" duration="640000" />
<workItem from="1575599624364" duration="95000" />
<workItem from="1575680867057" duration="23412000" />
<workItem from="1575708184460" duration="1282000" />
<workItem from="1575708184460" duration="1675000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -380,7 +380,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="334593000" />
<option name="totallyTimeSpent" value="334986000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -392,7 +392,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="57" y="50" width="1871" height="997" extended-state="1" />
<frame x="348" y="38" width="1871" height="997" 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.1722805" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -861,8 +861,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="790" column="44" lean-forward="false" selection-start-line="790" selection-start-column="44" selection-end-line="790" selection-end-column="44" />
<state relative-caret-position="210">
<caret line="729" column="21" lean-forward="true" selection-start-line="729" selection-start-column="21" selection-end-line="729" selection-end-column="21" />
<folding>
<element signature="e#574#693#0#PHP" expanded="false" />
<element signature="e#699#1012#0#PHP" expanded="false" />
... ... @@ -885,10 +885,10 @@
<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#34685#35942#0#PHP" expanded="false" />
<element signature="e#35963#39469#0#PHP" expanded="false" />
<element signature="e#38043#38430#0#PHP" expanded="false" />
<element signature="e#40210#47382#0#PHP" expanded="false" />
<element signature="e#34685#35992#0#PHP" expanded="false" />
<element signature="e#36013#39569#0#PHP" expanded="false" />
<element signature="e#38093#38480#0#PHP" expanded="false" />
<element signature="e#40209#47381#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -726,6 +726,7 @@ class Pay extends Api
$pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
$str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
}
$toporder['status'] = 30;
}
if(!empty($video_id)){
//判断是否为会员
... ... @@ -782,6 +783,7 @@ class Pay extends Api
$str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]";
}
}
$toporder['status'] = 40;
}
//发送短信
if(!empty($mobile)){
... ... @@ -790,12 +792,11 @@ class Pay extends Api
//支付成功，更新订单状态
$toporder['status'] = 20;
$toporder['paytime'] = time();
Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
}else{
//支付失败
$toporder['status'] = 1;
Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
}
Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
}else{
return $fail('通信失败，请稍后再通知我');
}
... ...