修改支付成功回调

郭盛
.idea/workspace.xml
application/api/controller/Pay.php
public/api.html
--- a/.idea/workspace.xml
查看文件 @eef1e23
+++ b/.idea/workspace.xml
查看文件 @eef1e23
@@ -2,8 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
-      <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" />
+      <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" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +13,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="44">
-              <caret line="1198" column="7" lean-forward="false" selection-start-line="1198" selection-start-column="7" selection-end-line="1198" selection-end-column="7" />
+            <state relative-caret-position="308">
+              <caret line="1015" column="28" lean-forward="false" selection-start-line="1015" selection-start-column="28" selection-end-line="1015" selection-end-column="28" />
               <folding>
                 <element signature="e#38#68#0#PHP" expanded="true" />
                 <element signature="e#337#456#0#PHP" expanded="false" />
@@ -66,17 +65,20 @@
                 <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#35806#0#PHP" expanded="false" />
+                <element signature="e#35811#40716#0#PHP" expanded="false" />
                 <element signature="e#40722#41480#0#PHP" expanded="false" />
+                <element signature="e#41485#43749#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
+      <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="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" />
+            <state relative-caret-position="184">
+              <caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
               <folding>
                 <element signature="e#450#569#0#PHP" expanded="false" />
                 <element signature="e#575#888#0#PHP" expanded="false" />
@@ -86,12 +88,12 @@
                 <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" />
+                <element signature="e#10034#13893#0#PHP" expanded="false" />
+                <element signature="e#13920#17622#0#PHP" expanded="false" />
+                <element signature="e#17652#20596#0#PHP" expanded="false" />
+                <element signature="e#20625#21455#0#PHP" expanded="false" />
+                <element signature="e#21484#22317#0#PHP" expanded="false" />
+                <element signature="e#22340#22557#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -151,8 +153,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/Pay.php" />
         <option value="$PROJECT_DIR$/application/api/controller/User.php" />
+        <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
       </list>
     </option>
   </component>
@@ -170,9 +172,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="263" />
-    <option name="y" value="8" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="160" />
+    <option name="y" value="37" />
     <option name="width" value="1699" />
     <option name="height" value="970" />
   </component>
@@ -269,7 +271,7 @@
       <workItem from="1574252363848" duration="8841000" />
       <workItem from="1574295812843" duration="20536000" />
       <workItem from="1574336957891" duration="1350000" />
-      <workItem from="1574382087071" duration="3161000" />
+      <workItem from="1574382087071" duration="4201000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -282,7 +284,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="143101000" />
+    <option name="totallyTimeSpent" value="144141000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -294,8 +296,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="263" y="8" width="1699" height="970" extended-state="0" />
-    <editor active="true" />
+    <frame x="160" y="37" width="1699" height="970" 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.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" />
@@ -304,7 +305,7 @@
       <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="false" show_stripe_button="true" weight="0.14885955" 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.14885955" 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" />
@@ -347,7 +348,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="7" />
+      <option name="time" value="8" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -676,33 +677,10 @@
         </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="44">
-          <caret line="1198" column="7" lean-forward="false" selection-start-line="1198" selection-start-column="7" selection-end-line="1198" selection-end-column="7" />
+        <state relative-caret-position="308">
+          <caret line="1015" column="28" lean-forward="false" selection-start-line="1015" selection-start-column="28" selection-end-line="1015" selection-end-column="28" />
           <folding>
             <element signature="e#38#68#0#PHP" expanded="true" />
             <element signature="e#337#456#0#PHP" expanded="false" />
@@ -750,7 +728,33 @@
             <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#35806#0#PHP" expanded="false" />
+            <element signature="e#35811#40716#0#PHP" expanded="false" />
             <element signature="e#40722#41480#0#PHP" expanded="false" />
+            <element signature="e#41485#43749#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="184">
+          <caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
+          <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#13893#0#PHP" expanded="false" />
+            <element signature="e#13920#17622#0#PHP" expanded="false" />
+            <element signature="e#17652#20596#0#PHP" expanded="false" />
+            <element signature="e#20625#21455#0#PHP" expanded="false" />
+            <element signature="e#21484#22317#0#PHP" expanded="false" />
+            <element signature="e#22340#22557#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
--- a/application/api/controller/Pay.php
查看文件 @eef1e23
+++ b/application/api/controller/Pay.php
查看文件 @eef1e23
@@ -277,8 +277,6 @@ class Pay extends Api
                             $res = Db::name('order')->where('id',$order_id)->update(['status'=>2,'paytime'=>time()]);
                             if($res && $arr){
                                 true;
-                            }else{
-                                $this->error('购买失败');
                             }
                             // 提交事务
                             Db::commit();
@@ -286,7 +284,9 @@ class Pay extends Api
                             dump($e->getMessage());
                             // 回滚事务
                             Db::rollback();
+                            $this->error('购买失败');
                         }
+                        $this->success('SUCCESS','支付成功');
                     }
                 }else{
                     $this->error('无效的订单');
--- a/public/api.html
查看文件 @eef1e23
+++ b/public/api.html
查看文件 @eef1e23
@@ -5230,7 +5230,7 @@
             <div class="row mt0 footer">
                 <div class="col-md-6" align="left">
-                    Generated on 2019-11-22 09:22:06                </div>
+                    Generated on 2019-11-22 09:40:13                </div>
                 <div class="col-md-6" align="right">
                     <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
                 </div>