郭盛 / areial · 提交

转到一个项目

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

修改订单

内嵌 并排对比
正在显示 2 个修改的文件 包含 21 行增加 和 20 行删除
@@ -89,8 +89,8 @@ @@ -89,8 +89,8 @@
89 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> 89 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
90 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 90 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
91 <provider selected="true" editor-type-id="text-editor"> 91 <provider selected="true" editor-type-id="text-editor">
92 - <state relative-caret-position="300">  
93 - <caret line="790" column="44" lean-forward="false" selection-start-line="790" selection-start-column="44" selection-end-line="790" selection-end-column="44" /> 92 + <state relative-caret-position="210">
  93 + <caret line="729" column="21" lean-forward="true" selection-start-line="729" selection-start-column="21" selection-end-line="729" selection-end-column="21" />
94 <folding> 94 <folding>
95 <element signature="e#574#693#0#PHP" expanded="false" /> 95 <element signature="e#574#693#0#PHP" expanded="false" />
96 <element signature="e#699#1012#0#PHP" expanded="false" /> 96 <element signature="e#699#1012#0#PHP" expanded="false" />
@@ -113,10 +113,10 @@ @@ -113,10 +113,10 @@
113 <element signature="e#26803#27196#0#PHP" expanded="false" /> 113 <element signature="e#26803#27196#0#PHP" expanded="false" />
114 <element signature="e#27223#30701#0#PHP" expanded="false" /> 114 <element signature="e#27223#30701#0#PHP" expanded="false" />
115 <element signature="e#30730#33635#0#PHP" expanded="false" /> 115 <element signature="e#30730#33635#0#PHP" expanded="false" />
116 - <element signature="e#34685#35942#0#PHP" expanded="false" />  
117 - <element signature="e#35963#39469#0#PHP" expanded="false" />  
118 - <element signature="e#38043#38430#0#PHP" expanded="false" />  
119 - <element signature="e#40210#47382#0#PHP" expanded="false" /> 116 + <element signature="e#34685#35992#0#PHP" expanded="false" />
  117 + <element signature="e#36013#39569#0#PHP" expanded="false" />
  118 + <element signature="e#38093#38480#0#PHP" expanded="false" />
  119 + <element signature="e#40209#47381#0#PHP" expanded="false" />
120 </folding> 120 </folding>
121 </state> 121 </state>
122 </provider> 122 </provider>
@@ -209,9 +209,9 @@ @@ -209,9 +209,9 @@
209 <sorting>DEFINITION_ORDER</sorting> 209 <sorting>DEFINITION_ORDER</sorting>
210 </component> 210 </component>
211 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 211 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
212 - <component name="ProjectFrameBounds" extendedState="1">  
213 - <option name="x" value="57" />  
214 - <option name="y" value="50" /> 212 + <component name="ProjectFrameBounds">
  213 + <option name="x" value="348" />
  214 + <option name="y" value="38" />
215 <option name="width" value="1871" /> 215 <option name="width" value="1871" />
216 <option name="height" value="997" /> 216 <option name="height" value="997" />
217 </component> 217 </component>
@@ -367,7 +367,7 @@ @@ -367,7 +367,7 @@
367 <workItem from="1575592025964" duration="640000" /> 367 <workItem from="1575592025964" duration="640000" />
368 <workItem from="1575599624364" duration="95000" /> 368 <workItem from="1575599624364" duration="95000" />
369 <workItem from="1575680867057" duration="23412000" /> 369 <workItem from="1575680867057" duration="23412000" />
370 - <workItem from="1575708184460" duration="1282000" /> 370 + <workItem from="1575708184460" duration="1675000" />
371 </task> 371 </task>
372 <task id="LOCAL-00001" summary="调试"> 372 <task id="LOCAL-00001" summary="调试">
373 <created>1574145133364</created> 373 <created>1574145133364</created>
@@ -380,7 +380,7 @@ @@ -380,7 +380,7 @@
380 <servers /> 380 <servers />
381 </component> 381 </component>
382 <component name="TimeTrackingManager"> 382 <component name="TimeTrackingManager">
383 - <option name="totallyTimeSpent" value="334593000" /> 383 + <option name="totallyTimeSpent" value="334986000" />
384 </component> 384 </component>
385 <component name="TodoView"> 385 <component name="TodoView">
386 <todo-panel id="selected-file"> 386 <todo-panel id="selected-file">
@@ -392,7 +392,7 @@ @@ -392,7 +392,7 @@
392 </todo-panel> 392 </todo-panel>
393 </component> 393 </component>
394 <component name="ToolWindowManager"> 394 <component name="ToolWindowManager">
395 - <frame x="57" y="50" width="1871" height="997" extended-state="1" /> 395 + <frame x="348" y="38" width="1871" height="997" extended-state="0" />
396 <editor active="true" /> 396 <editor active="true" />
397 <layout> 397 <layout>
398 <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" /> 398 <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 @@ @@ -861,8 +861,8 @@
861 </entry> 861 </entry>
862 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 862 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
863 <provider selected="true" editor-type-id="text-editor"> 863 <provider selected="true" editor-type-id="text-editor">
864 - <state relative-caret-position="300">  
865 - <caret line="790" column="44" lean-forward="false" selection-start-line="790" selection-start-column="44" selection-end-line="790" selection-end-column="44" /> 864 + <state relative-caret-position="210">
  865 + <caret line="729" column="21" lean-forward="true" selection-start-line="729" selection-start-column="21" selection-end-line="729" selection-end-column="21" />
866 <folding> 866 <folding>
867 <element signature="e#574#693#0#PHP" expanded="false" /> 867 <element signature="e#574#693#0#PHP" expanded="false" />
868 <element signature="e#699#1012#0#PHP" expanded="false" /> 868 <element signature="e#699#1012#0#PHP" expanded="false" />
@@ -885,10 +885,10 @@ @@ -885,10 +885,10 @@
885 <element signature="e#26803#27196#0#PHP" expanded="false" /> 885 <element signature="e#26803#27196#0#PHP" expanded="false" />
886 <element signature="e#27223#30701#0#PHP" expanded="false" /> 886 <element signature="e#27223#30701#0#PHP" expanded="false" />
887 <element signature="e#30730#33635#0#PHP" expanded="false" /> 887 <element signature="e#30730#33635#0#PHP" expanded="false" />
888 - <element signature="e#34685#35942#0#PHP" expanded="false" />  
889 - <element signature="e#35963#39469#0#PHP" expanded="false" />  
890 - <element signature="e#38043#38430#0#PHP" expanded="false" />  
891 - <element signature="e#40210#47382#0#PHP" expanded="false" /> 888 + <element signature="e#34685#35992#0#PHP" expanded="false" />
  889 + <element signature="e#36013#39569#0#PHP" expanded="false" />
  890 + <element signature="e#38093#38480#0#PHP" expanded="false" />
  891 + <element signature="e#40209#47381#0#PHP" expanded="false" />
892 </folding> 892 </folding>
893 </state> 893 </state>
894 </provider> 894 </provider>
@@ -726,6 +726,7 @@ class Pay extends Api @@ -726,6 +726,7 @@ class Pay extends Api
726 $pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find(); 726 $pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
727 $str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],"; 727 $str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
728 } 728 }
  729 + $toporder['status'] = 30;
729 } 730 }
730 if(!empty($video_id)){ 731 if(!empty($video_id)){
731 //判断是否为会员 732 //判断是否为会员
@@ -782,6 +783,7 @@ class Pay extends Api @@ -782,6 +783,7 @@ class Pay extends Api
782 $str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]"; 783 $str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]";
783 } 784 }
784 } 785 }
  786 + $toporder['status'] = 40;
785 } 787 }
786 //发送短信 788 //发送短信
787 if(!empty($mobile)){ 789 if(!empty($mobile)){
@@ -790,12 +792,11 @@ class Pay extends Api @@ -790,12 +792,11 @@ class Pay extends Api
790 //支付成功，更新订单状态 792 //支付成功，更新订单状态
791 $toporder['status'] = 20; 793 $toporder['status'] = 20;
792 $toporder['paytime'] = time(); 794 $toporder['paytime'] = time();
793 - Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);  
794 }else{ 795 }else{
795 //支付失败 796 //支付失败
796 $toporder['status'] = 1; 797 $toporder['status'] = 1;
797 - Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);  
798 } 798 }
  799 + Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
799 }else{ 800 }else{
800 return $fail('通信失败，请稍后再通知我'); 801 return $fail('通信失败，请稍后再通知我');
801 } 802 }