郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 45752001ce2696d73a79ea835d76950a189dab3f 1 个父辈 bdb71ab2
1 个管道 的构建 通过 耗费 5 秒

修改微信支付

内嵌 并排对比
正在显示 3 个修改的文件 包含 243 行增加 和 151 行删除
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
5 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" /> 6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
8 </list> 7 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
10 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -91,8 +90,8 @@ @@ -91,8 +90,8 @@
91 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> 90 <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
92 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 91 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
93 <provider selected="true" editor-type-id="text-editor"> 92 <provider selected="true" editor-type-id="text-editor">
94 - <state relative-caret-position="44">  
95 - <caret line="408" column="58" lean-forward="true" selection-start-line="408" selection-start-column="58" selection-end-line="408" selection-end-column="58" /> 93 + <state relative-caret-position="525">
  94 + <caret line="312" column="27" lean-forward="true" selection-start-line="312" selection-start-column="27" selection-end-line="312" selection-end-column="27" />
96 <folding> 95 <folding>
97 <element signature="e#574#693#0#PHP" expanded="false" /> 96 <element signature="e#574#693#0#PHP" expanded="false" />
98 <element signature="e#699#1012#0#PHP" expanded="false" /> 97 <element signature="e#699#1012#0#PHP" expanded="false" />
@@ -102,11 +101,12 @@ @@ -102,11 +101,12 @@
102 <element signature="e#5512#5930#0#PHP" expanded="false" /> 101 <element signature="e#5512#5930#0#PHP" expanded="false" />
103 <element signature="e#6179#6269#0#PHP" expanded="false" /> 102 <element signature="e#6179#6269#0#PHP" expanded="false" />
104 <element signature="e#6347#6443#0#PHP" expanded="false" /> 103 <element signature="e#6347#6443#0#PHP" expanded="false" />
  104 + <element signature="e#6806#15962#0#PHP" expanded="false" />
105 <element signature="e#7772#9181#0#PHP" expanded="false" /> 105 <element signature="e#7772#9181#0#PHP" expanded="false" />
106 <element signature="e#11546#11997#0#PHP" expanded="false" /> 106 <element signature="e#11546#11997#0#PHP" expanded="false" />
107 <element signature="e#13212#13330#0#PHP" expanded="false" /> 107 <element signature="e#13212#13330#0#PHP" expanded="false" />
108 - <element signature="e#14187#15962#0#PHP" expanded="false" />  
109 <element signature="e#16035#16455#0#PHP" expanded="false" /> 108 <element signature="e#16035#16455#0#PHP" expanded="false" />
  109 + <element signature="e#16460#26484#0#PHP" expanded="false" />
110 <element signature="e#18227#19634#0#PHP" expanded="false" /> 110 <element signature="e#18227#19634#0#PHP" expanded="false" />
111 <element signature="e#23664#23782#0#PHP" expanded="false" /> 111 <element signature="e#23664#23782#0#PHP" expanded="false" />
112 <element signature="e#24230#24461#0#PHP" expanded="false" /> 112 <element signature="e#24230#24461#0#PHP" expanded="false" />
@@ -115,17 +115,27 @@ @@ -115,17 +115,27 @@
115 <element signature="e#26803#27196#0#PHP" expanded="false" /> 115 <element signature="e#26803#27196#0#PHP" expanded="false" />
116 <element signature="e#27223#30701#0#PHP" expanded="false" /> 116 <element signature="e#27223#30701#0#PHP" expanded="false" />
117 <element signature="e#30730#33635#0#PHP" expanded="false" /> 117 <element signature="e#30730#33635#0#PHP" expanded="false" />
118 - <element signature="e#33664#37727#0#PHP" expanded="false" />  
119 - <element signature="e#35779#37216#0#PHP" expanded="false" />  
120 - <element signature="e#37264#37366#0#PHP" expanded="false" />  
121 - <element signature="e#37756#42219#0#PHP" expanded="false" />  
122 - <element signature="e#39986#41734#0#PHP" expanded="false" />  
123 - <element signature="e#42242#42459#0#PHP" expanded="false" /> 118 + <element signature="e#36003#39724#0#PHP" expanded="false" />
  119 + <element signature="e#40902#48074#0#PHP" expanded="false" />
  120 + <element signature="e#43168#46889#0#PHP" expanded="false" />
  121 + <element signature="e#46945#47055#0#PHP" expanded="false" />
  122 + <element signature="e#47331#47400#0#PHP" expanded="false" />
  123 + <element signature="e#48097#48314#0#PHP" expanded="false" />
124 </folding> 124 </folding>
125 </state> 125 </state>
126 </provider> 126 </provider>
127 </entry> 127 </entry>
128 </file> 128 </file>
  129 + <file leaf-file-name="07.log" pinned="false" current-in-tab="false">
  130 + <entry file="file://$PROJECT_DIR$/runtime/log/201912/07.log">
  131 + <provider selected="true" editor-type-id="text-editor">
  132 + <state relative-caret-position="0">
  133 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  134 + <folding />
  135 + </state>
  136 + </provider>
  137 + </entry>
  138 + </file>
129 </leaf> 139 </leaf>
130 </component> 140 </component>
131 <component name="FindInProjectRecents"> 141 <component name="FindInProjectRecents">
@@ -133,6 +143,7 @@ @@ -133,6 +143,7 @@
133 <find>image</find> 143 <find>image</find>
134 <find>init($token)</find> 144 <find>init($token)</find>
135 <find>BaseCli</find> 145 <find>BaseCli</find>
  146 + <find>picpay</find>
136 </findStrings> 147 </findStrings>
137 <dirStrings> 148 <dirStrings>
138 <dir>D:\htdocs\areial</dir> 149 <dir>D:\htdocs\areial</dir>
@@ -144,7 +155,6 @@ @@ -144,7 +155,6 @@
144 <component name="IdeDocumentHistory"> 155 <component name="IdeDocumentHistory">
145 <option name="CHANGED_PATHS"> 156 <option name="CHANGED_PATHS">
146 <list> 157 <list>
147 - <option value="$PROJECT_DIR$/application/admin/model/Pic.php" />  
148 <option value="$PROJECT_DIR$/application/admin/model/Type.php" /> 158 <option value="$PROJECT_DIR$/application/admin/model/Type.php" />
149 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" /> 159 <option value="$PROJECT_DIR$/application/admin/view/pic/index.html" />
150 <option value="$PROJECT_DIR$/application/index/controller/User.php" /> 160 <option value="$PROJECT_DIR$/application/index/controller/User.php" />
@@ -195,6 +205,7 @@ @@ -195,6 +205,7 @@
195 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" /> 205 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
196 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" /> 206 <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
197 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> 207 <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
  208 + <option value="$PROJECT_DIR$/runtime/log/201912/07.log" />
198 </list> 209 </list>
199 </option> 210 </option>
200 </component> 211 </component>
@@ -213,10 +224,10 @@ @@ -213,10 +224,10 @@
213 </component> 224 </component>
214 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 225 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
215 <component name="ProjectFrameBounds" extendedState="7"> 226 <component name="ProjectFrameBounds" extendedState="7">
216 - <option name="x" value="221" />  
217 - <option name="y" value="64" />  
218 - <option name="width" value="1700" />  
219 - <option name="height" value="1100" /> 227 + <option name="x" value="-60" />
  228 + <option name="y" value="56" />
  229 + <option name="width" value="1871" />
  230 + <option name="height" value="1007" />
220 </component> 231 </component>
221 <component name="ProjectView"> 232 <component name="ProjectView">
222 <navigator currentView="ProjectPane" proportions="" version="1"> 233 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -243,33 +254,20 @@ @@ -243,33 +254,20 @@
243 <path> 254 <path>
244 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 255 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
245 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 256 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
246 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
247 - </path>  
248 - <path>  
249 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
250 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
251 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
252 - <item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />  
253 - </path>  
254 - <path>  
255 - <item name="areial" type="b2602c69:ProjectViewProjectNode" />  
256 - <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />  
257 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
258 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" /> 257 + <item name="runtime" type="2a2b976b:PhpTreeStructureProvider$1" />
259 </path> 258 </path>
260 <path> 259 <path>
261 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 260 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
262 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 261 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
263 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
264 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
265 - <item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" /> 262 + <item name="runtime" type="2a2b976b:PhpTreeStructureProvider$1" />
  263 + <item name="log" type="2a2b976b:PhpTreeStructureProvider$1" />
266 </path> 264 </path>
267 <path> 265 <path>
268 <item name="areial" type="b2602c69:ProjectViewProjectNode" /> 266 <item name="areial" type="b2602c69:ProjectViewProjectNode" />
269 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" /> 267 <item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
270 - <item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />  
271 - <item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />  
272 - <item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" /> 268 + <item name="runtime" type="2a2b976b:PhpTreeStructureProvider$1" />
  269 + <item name="log" type="2a2b976b:PhpTreeStructureProvider$1" />
  270 + <item name="201912" type="2a2b976b:PhpTreeStructureProvider$1" />
273 </path> 271 </path>
274 </expand> 272 </expand>
275 <select /> 273 <select />
@@ -357,7 +355,7 @@ @@ -357,7 +355,7 @@
357 <workItem from="1575541798312" duration="2359000" /> 355 <workItem from="1575541798312" duration="2359000" />
358 <workItem from="1575592025964" duration="640000" /> 356 <workItem from="1575592025964" duration="640000" />
359 <workItem from="1575599624364" duration="95000" /> 357 <workItem from="1575599624364" duration="95000" />
360 - <workItem from="1575680867057" duration="15315000" /> 358 + <workItem from="1575680867057" duration="21155000" />
361 </task> 359 </task>
362 <task id="LOCAL-00001" summary="调试"> 360 <task id="LOCAL-00001" summary="调试">
363 <created>1574145133364</created> 361 <created>1574145133364</created>
@@ -370,7 +368,7 @@ @@ -370,7 +368,7 @@
370 <servers /> 368 <servers />
371 </component> 369 </component>
372 <component name="TimeTrackingManager"> 370 <component name="TimeTrackingManager">
373 - <option name="totallyTimeSpent" value="325214000" /> 371 + <option name="totallyTimeSpent" value="331054000" />
374 </component> 372 </component>
375 <component name="TodoView"> 373 <component name="TodoView">
376 <todo-panel id="selected-file"> 374 <todo-panel id="selected-file">
@@ -383,6 +381,7 @@ @@ -383,6 +381,7 @@
383 </component> 381 </component>
384 <component name="ToolWindowManager"> 382 <component name="ToolWindowManager">
385 <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> 383 <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
  384 + <editor active="true" />
386 <layout> 385 <layout>
387 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1705757" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 386 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1705757" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
388 <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" /> 387 <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" />
@@ -391,7 +390,7 @@ @@ -391,7 +390,7 @@
391 <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" /> 390 <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" />
392 <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" /> 391 <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" />
393 <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" /> 392 <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" />
394 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16648531" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 393 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15886833" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
395 <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" /> 394 <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" />
396 <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" /> 395 <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" />
397 <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" /> 396 <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" />
@@ -439,13 +438,6 @@ @@ -439,13 +438,6 @@
439 <watches-manager /> 438 <watches-manager />
440 </component> 439 </component>
441 <component name="editorHistoryManager"> 440 <component name="editorHistoryManager">
442 - <entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">  
443 - <provider selected="true" editor-type-id="text-editor">  
444 - <state relative-caret-position="568">  
445 - <caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />  
446 - </state>  
447 - </provider>  
448 - </entry>  
449 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php"> 441 <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/vip.php">
450 <provider selected="true" editor-type-id="text-editor"> 442 <provider selected="true" editor-type-id="text-editor">
451 <state relative-caret-position="200"> 443 <state relative-caret-position="200">
@@ -879,10 +871,18 @@ @@ -879,10 +871,18 @@
879 </state> 871 </state>
880 </provider> 872 </provider>
881 </entry> 873 </entry>
  874 + <entry file="file://$PROJECT_DIR$/runtime/log/201912/07.log">
  875 + <provider selected="true" editor-type-id="text-editor">
  876 + <state relative-caret-position="0">
  877 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  878 + <folding />
  879 + </state>
  880 + </provider>
  881 + </entry>
882 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> 882 <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
883 <provider selected="true" editor-type-id="text-editor"> 883 <provider selected="true" editor-type-id="text-editor">
884 - <state relative-caret-position="44">  
885 - <caret line="408" column="58" lean-forward="true" selection-start-line="408" selection-start-column="58" selection-end-line="408" selection-end-column="58" /> 884 + <state relative-caret-position="525">
  885 + <caret line="312" column="27" lean-forward="true" selection-start-line="312" selection-start-column="27" selection-end-line="312" selection-end-column="27" />
886 <folding> 886 <folding>
887 <element signature="e#574#693#0#PHP" expanded="false" /> 887 <element signature="e#574#693#0#PHP" expanded="false" />
888 <element signature="e#699#1012#0#PHP" expanded="false" /> 888 <element signature="e#699#1012#0#PHP" expanded="false" />
@@ -892,11 +892,12 @@ @@ -892,11 +892,12 @@
892 <element signature="e#5512#5930#0#PHP" expanded="false" /> 892 <element signature="e#5512#5930#0#PHP" expanded="false" />
893 <element signature="e#6179#6269#0#PHP" expanded="false" /> 893 <element signature="e#6179#6269#0#PHP" expanded="false" />
894 <element signature="e#6347#6443#0#PHP" expanded="false" /> 894 <element signature="e#6347#6443#0#PHP" expanded="false" />
  895 + <element signature="e#6806#15962#0#PHP" expanded="false" />
895 <element signature="e#7772#9181#0#PHP" expanded="false" /> 896 <element signature="e#7772#9181#0#PHP" expanded="false" />
896 <element signature="e#11546#11997#0#PHP" expanded="false" /> 897 <element signature="e#11546#11997#0#PHP" expanded="false" />
897 <element signature="e#13212#13330#0#PHP" expanded="false" /> 898 <element signature="e#13212#13330#0#PHP" expanded="false" />
898 - <element signature="e#14187#15962#0#PHP" expanded="false" />  
899 <element signature="e#16035#16455#0#PHP" expanded="false" /> 899 <element signature="e#16035#16455#0#PHP" expanded="false" />
  900 + <element signature="e#16460#26484#0#PHP" expanded="false" />
900 <element signature="e#18227#19634#0#PHP" expanded="false" /> 901 <element signature="e#18227#19634#0#PHP" expanded="false" />
901 <element signature="e#23664#23782#0#PHP" expanded="false" /> 902 <element signature="e#23664#23782#0#PHP" expanded="false" />
902 <element signature="e#24230#24461#0#PHP" expanded="false" /> 903 <element signature="e#24230#24461#0#PHP" expanded="false" />
@@ -905,12 +906,12 @@ @@ -905,12 +906,12 @@
905 <element signature="e#26803#27196#0#PHP" expanded="false" /> 906 <element signature="e#26803#27196#0#PHP" expanded="false" />
906 <element signature="e#27223#30701#0#PHP" expanded="false" /> 907 <element signature="e#27223#30701#0#PHP" expanded="false" />
907 <element signature="e#30730#33635#0#PHP" expanded="false" /> 908 <element signature="e#30730#33635#0#PHP" expanded="false" />
908 - <element signature="e#33664#37727#0#PHP" expanded="false" />  
909 - <element signature="e#35779#37216#0#PHP" expanded="false" />  
910 - <element signature="e#37264#37366#0#PHP" expanded="false" />  
911 - <element signature="e#37756#42219#0#PHP" expanded="false" />  
912 - <element signature="e#39986#41734#0#PHP" expanded="false" />  
913 - <element signature="e#42242#42459#0#PHP" expanded="false" /> 909 + <element signature="e#36003#39724#0#PHP" expanded="false" />
  910 + <element signature="e#40902#48074#0#PHP" expanded="false" />
  911 + <element signature="e#43168#46889#0#PHP" expanded="false" />
  912 + <element signature="e#46945#47055#0#PHP" expanded="false" />
  913 + <element signature="e#47331#47400#0#PHP" expanded="false" />
  914 + <element signature="e#48097#48314#0#PHP" expanded="false" />
914 </folding> 915 </folding>
915 </state> 916 </state>
916 </provider> 917 </provider>
@@ -688,16 +688,14 @@ class Pay extends Api @@ -688,16 +688,14 @@ class Pay extends Api
688 688
689 //图片支付订单结果通知（无需调用） 689 //图片支付订单结果通知（无需调用）
690 public function picOrderNotify(){ 690 public function picOrderNotify(){
  691 + Log::info('11111111');
691 $config = config('verify.wx_pay'); 692 $config = config('verify.wx_pay');
692 $app = Factory::payment($config); 693 $app = Factory::payment($config);
693 $response = $app->handlePaidNotify(function($message, $fail){ 694 $response = $app->handlePaidNotify(function($message, $fail){
694 //return_code 表示通信状态 695 //return_code 表示通信状态
695 if ($message['return_code'] === 'SUCCESS') { 696 if ($message['return_code'] === 'SUCCESS') {
696 if ($message['result_code'] === 'SUCCESS') { 697 if ($message['result_code'] === 'SUCCESS') {
697 - //支付成功，更新订单状态  
698 - $toporder['status'] = 2;  
699 - $toporder['paytime'] = time();  
700 - 698 + Log::info($message);
701 //找到该订单信息 699 //找到该订单信息
702 $data = Db::name('order')->where('id',$message['out_trade_no'])->find(); 700 $data = Db::name('order')->where('id',$message['out_trade_no'])->find();
703 $pic_id = explode(',',$data['pic_id']); 701 $pic_id = explode(',',$data['pic_id']);
@@ -706,61 +704,113 @@ class Pay extends Api @@ -706,61 +704,113 @@ class Pay extends Api
706 $user = Db::name('user')->where('id',$data['user_id'])->find(); 704 $user = Db::name('user')->where('id',$data['user_id'])->find();
707 $mobile = $user['mobile']; 705 $mobile = $user['mobile'];
708 $str = "【仁甲看见】"; 706 $str = "【仁甲看见】";
  707 + // 启动事务
  708 + Db::startTrans();
  709 + try{
  710 + if(!empty($pic_id)){
  711 + //将购买次数加1
  712 + foreach ($pic_id as $key => $v){
  713 + //非会员
  714 + if($user['is_vip'] == 0){
  715 + $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
  716 + Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);
  717 + }else{
  718 + //是会员
  719 + $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
  720 + $total_money = $pic['money'] + ($pic['price']*0.75);
  721 + Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
  722 + }
  723 + }
  724 + //拼接发送短信的内容
  725 + foreach ($pic_id as $key => $v){
  726 + $pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
  727 + $str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
  728 + }
  729 + }
709 730
710 - //判断用户是否为会员  
711 - if(!empty($pic_id)){  
712 - foreach ($pic_id as $key => $v){  
713 - //非会员 731 + if(!empty($video_id)){
  732 + //判断是否为会员
714 if($user['is_vip'] == 0){ 733 if($user['is_vip'] == 0){
715 - $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();  
716 - Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]); 734 + //不是会员的情况
  735 + //将购买次数加1
  736 + foreach ($video_id as $key => $val){
  737 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  738 + if($val['attr'] == 1){
  739 + $video_money = $video['money'] + $video['price'];
  740 + }elseif ($val['attr'] == 2){
  741 + $video_money = $video['money'] + $video['four_price'];
  742 + }else{
  743 + $video_money = $video['money'] + $video['eight_price'];
  744 + }
  745 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  746 + }
717 }else{ 747 }else{
718 - //是会员  
719 - $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();  
720 - Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]); 748 + //是会员的情况
  749 + //将购买次数加1
  750 + foreach ($video_id as $key => $val){
  751 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  752 + if($val['attr'] == 1){
  753 + $video_money = $video['money'] + ($video['price']*0.75);
  754 + }elseif ($val['attr'] == 2){
  755 + $video_money = $video['money'] + ($video['four_price']*0.75);
  756 + }else{
  757 + $video_money = $video['money'] + ($video['eight_price']*0.75);
  758 + }
  759 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  760 + }
721 } 761 }
722 - }  
723 - foreach ($pic_id as $key => $v){  
724 - $pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();  
725 - $str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";  
726 - }  
727 - }  
728 - if(!empty($video_id)){  
729 - foreach ($video_id as &$val){  
730 - if($val['attr'] == 1){  
731 - $val['attr'] = '2k';  
732 - }elseif ($val['attr'] == 2){  
733 - $val['attr'] = '4k';  
734 - }else{  
735 - $val['attr'] = '8k'; 762 +
  763 + //判断视频的属性
  764 + foreach ($video_id as &$val){
  765 + if($val['attr'] == 1){
  766 + $val['attr'] = '2k';
  767 + }elseif ($val['attr'] == 2){
  768 + $val['attr'] = '4k';
  769 + }else{
  770 + $val['attr'] = '8k';
  771 + }
736 } 772 }
737 - }  
738 - foreach ($video_id as $k=>$v){  
739 - if($v['attr'] == '4k'){  
740 - $video = Db::name('video')->field('id,title,four_url,four_code')->where('id',$v['id'])->find();  
741 - $str .= "视频标题:$video[title],云盘地址:$video[four_url],提取码:$video[four_code]";  
742 - }elseif ($v['attr'] == '2k'){  
743 - $video = Db::name('video')->field('id,title,two_url,two_code')->where('id',$v['id'])->find();  
744 - $str .= "视频标题:$video[title],云盘地址:$video[two_url],提取码:$video[two_code]";  
745 - }elseif ($v['attr'] == '8k'){  
746 - $video = Db::name('video')->field('id,title,eight_url,eight_code')->where('id',$v['id'])->find();  
747 - $str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]"; 773 + //拼接发送短信的内容
  774 + foreach ($video_id as $k=>$v){
  775 + if($v['attr'] == '4k'){
  776 + $video = Db::name('video')->field('id,title,four_url,four_code')->where('id',$v['id'])->find();
  777 + $str .= "视频标题:$video[title],云盘地址:$video[four_url],提取码:$video[four_code]";
  778 + }elseif ($v['attr'] == '2k'){
  779 + $video = Db::name('video')->field('id,title,two_url,two_code')->where('id',$v['id'])->find();
  780 + $str .= "视频标题:$video[title],云盘地址:$video[two_url],提取码:$video[two_code]";
  781 + }elseif ($v['attr'] == '8k'){
  782 + $video = Db::name('video')->field('id,title,eight_url,eight_code')->where('id',$v['id'])->find();
  783 + $str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]";
  784 + }
748 } 785 }
749 } 786 }
750 - }  
751 - //发送短信  
752 - if(!empty($mobile)){  
753 - $result = $this->sms($mobile,$str); 787 + //发送短信
  788 + if(!empty($mobile)){
  789 + $result = $this->sms($mobile,$str);
  790 + }
  791 + //支付成功，更新订单状态
  792 + $toporder['status'] = 2;
  793 + $toporder['paytime'] = time();
  794 + $res = Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
  795 + if($res){
  796 + true;
  797 + }
  798 + // 提交事务
  799 + Db::commit();
  800 + } catch (\Exception $e) {
  801 + dump($e->getMessage());
  802 + // 回滚事务
  803 + Db::rollback();
  804 + $this->error('购买失败');
754 } 805 }
755 }else{ 806 }else{
756 //支付失败 807 //支付失败
757 $toporder['status'] = 1; 808 $toporder['status'] = 1;
  809 + Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
758 } 810 }
759 }else{ 811 }else{
760 return $fail('通信失败，请稍后再通知我'); 812 return $fail('通信失败，请稍后再通知我');
761 } 813 }
762 - Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);  
763 - return true; // 返回处理完成  
764 }); 814 });
765 $response->send(); 815 $response->send();
766 } 816 }
@@ -773,78 +823,119 @@ class Pay extends Api @@ -773,78 +823,119 @@ class Pay extends Api
773 //return_code 表示通信状态 823 //return_code 表示通信状态
774 if ($message['return_code'] === 'SUCCESS') { 824 if ($message['return_code'] === 'SUCCESS') {
775 if ($message['result_code'] === 'SUCCESS') { 825 if ($message['result_code'] === 'SUCCESS') {
776 - //支付成功，更新订单状态  
777 - $toporder['status'] = 2;  
778 - $toporder['paytime'] = time();  
779 $data = Db::name('order')->where('id',$message['out_trade_no'])->find(); 826 $data = Db::name('order')->where('id',$message['out_trade_no'])->find();
780 $pic_id = explode(',',$data['pic_id']); 827 $pic_id = explode(',',$data['pic_id']);
781 $video_id = unserialize($data['video_id']); 828 $video_id = unserialize($data['video_id']);
782 -  
783 $user = Db::name('user')->where('id',$data['user_id'])->find(); 829 $user = Db::name('user')->where('id',$data['user_id'])->find();
784 $mobile = $user['mobile']; 830 $mobile = $user['mobile'];
785 $str = "【仁甲看见】"; 831 $str = "【仁甲看见】";
786 -  
787 - //判断用户是否为会员  
788 - $login = Db::name('user')  
789 - ->where('id',$data['user_id'])  
790 - ->field('id,is_vip')  
791 - ->find();  
792 -  
793 - if(!empty($pic_id)){  
794 - foreach ($pic_id as $key => $v){  
795 - //非会员  
796 - if($login['is_vip'] == 0){  
797 - $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();  
798 - Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]);  
799 - }else{  
800 - //是会员  
801 - $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();  
802 - Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$pic['money']+$pic['price']]); 832 + // 启动事务
  833 + Db::startTrans();
  834 + try{
  835 + if(!empty($pic_id)){
  836 + //将购买次数加1
  837 + foreach ($pic_id as $key => $v){
  838 + //非会员
  839 + if($user['is_vip'] == 0){
  840 + $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
  841 + $total_money = $pic['money'] + $pic['price'];
  842 + Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
  843 + }else{
  844 + //是会员
  845 + $pic = Db::name('pic')->field('id,price,buy_num,money')->where('id',$v)->find();
  846 + $total_money = $pic['money'] + ($pic['price']*0.75);
  847 + Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1,'money'=>$total_money]);
  848 + }
  849 + }
  850 + //拼接发送短信的内容
  851 + foreach ($pic_id as $key => $v){
  852 + $pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
  853 + $str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";
803 } 854 }
804 } 855 }
805 - foreach ($pic_id as $key => $v){  
806 - $pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();  
807 - $str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code],";  
808 - }  
809 - }  
810 - if(!empty($video_id)){  
811 - foreach ($video_id as $key => $val){  
812 - $video = Db::name('video')->field('id,buy_num')->where('id',$val['id'])->find();  
813 - Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1]);  
814 - }  
815 - foreach ($video_id as &$val){  
816 - if($val['attr'] == 1){  
817 - $val['attr'] = '2k';  
818 - }elseif ($val['attr'] == 2){  
819 - $val['attr'] = '4k'; 856 + if(!empty($video_id)){
  857 + //判断是否为会员
  858 + if($user['is_vip'] == 0){
  859 + //不是会员的情况
  860 + //将购买次数加1
  861 + foreach ($video_id as $key => $val){
  862 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  863 + if($val['attr'] == 1){
  864 + $video_money = $video['money'] + $video['price'];
  865 + }elseif ($val['attr'] == 2){
  866 + $video_money = $video['money'] + $video['four_price'];
  867 + }else{
  868 + $video_money = $video['money'] + $video['eight_price'];
  869 + }
  870 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  871 + }
820 }else{ 872 }else{
821 - $val['attr'] = '8k'; 873 + //是会员的情况
  874 + //将购买次数加1
  875 + foreach ($video_id as $key => $val){
  876 + $video = Db::name('video')->field('id,buy_num,price,four_price,eight_price,money')->where('id',$val['id'])->find();
  877 + if($val['attr'] == 1){
  878 + $video_money = $video['money'] + ($video['price']*0.75);
  879 + }elseif ($val['attr'] == 2){
  880 + $video_money = $video['money'] + ($video['four_price']*0.75);
  881 + }else{
  882 + $video_money = $video['money'] + ($video['eight_price']*0.75);
  883 + }
  884 + Db::name('video')->where('id',$video['id'])->update(['buy_num'=>$video['buy_num']+1,'money'=>$video_money]);
  885 + }
822 } 886 }
823 - }  
824 - foreach ($video_id as $k=>$v){  
825 - if($v['attr'] == '4k'){  
826 - $video = Db::name('video')->field('id,title,four_url,four_code')->where('id',$v['id'])->find();  
827 - $str .= "视频标题:$video[title],云盘地址:$video[four_url],提取码:$video[four_code]";  
828 - }elseif ($v['attr'] == '2k'){  
829 - $video = Db::name('video')->field('id,title,two_url,two_code')->where('id',$v['id'])->find();  
830 - $str .= "视频标题:$video[title],云盘地址:$video[two_url],提取码:$video[two_code]";  
831 - }elseif ($v['attr'] == '8k'){  
832 - $video = Db::name('video')->field('id,title,eight_url,eight_code')->where('id',$v['id'])->find();  
833 - $str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]"; 887 +
  888 + //判断视频的属性
  889 + foreach ($video_id as &$val){
  890 + if($val['attr'] == 1){
  891 + $val['attr'] = '2k';
  892 + }elseif ($val['attr'] == 2){
  893 + $val['attr'] = '4k';
  894 + }else{
  895 + $val['attr'] = '8k';
  896 + }
  897 + }
  898 + //拼接发送短信的内容
  899 + foreach ($video_id as $k=>$v){
  900 + if($v['attr'] == '4k'){
  901 + $video = Db::name('video')->field('id,title,four_url,four_code')->where('id',$v['id'])->find();
  902 + $str .= "视频标题:$video[title],云盘地址:$video[four_url],提取码:$video[four_code]";
  903 + }elseif ($v['attr'] == '2k'){
  904 + $video = Db::name('video')->field('id,title,two_url,two_code')->where('id',$v['id'])->find();
  905 + $str .= "视频标题:$video[title],云盘地址:$video[two_url],提取码:$video[two_code]";
  906 + }elseif ($v['attr'] == '8k'){
  907 + $video = Db::name('video')->field('id,title,eight_url,eight_code')->where('id',$v['id'])->find();
  908 + $str .= "视频标题:$video[title],云盘地址:$video[eight_url],提取码:$video[eight_code]";
  909 + }
834 } 910 }
835 } 911 }
836 - }  
837 - if(!empty($mobile)){  
838 - $result = $this->sms($mobile,$str); 912 + //发送短信
  913 + if(!empty($mobile)){
  914 + $result = $this->sms($mobile,$str);
  915 + }
  916 + //支付成功，更新订单状态
  917 + $toporder['status'] = 2;
  918 + $toporder['paytime'] = time();
  919 + $res = Db::name('order')->where('num',$message['out_trade_no'])->update($toporder);
  920 + if($res){
  921 + true;
  922 + }
  923 + // 提交事务
  924 + Db::commit();
  925 + } catch (\Exception $e) {
  926 + dump($e->getMessage());
  927 + // 回滚事务
  928 + Db::rollback();
  929 + $this->error('购买失败');
839 } 930 }
840 }else{ 931 }else{
841 //支付失败 932 //支付失败
842 $toporder['status'] = 1; 933 $toporder['status'] = 1;
  934 + Db::name('vorder')->where('num',$message['out_trade_no'])->update($toporder);
843 } 935 }
844 }else{ 936 }else{
845 return $fail('通信失败，请稍后再通知我'); 937 return $fail('通信失败，请稍后再通知我');
846 } 938 }
847 - Db::name('vorder')->where('num',$message['out_trade_no'])->update($toporder);  
848 return true; // 返回处理完成 939 return true; // 返回处理完成
849 }); 940 });
850 $response->send(); 941 $response->send();
@@ -6612,7 +6612,7 @@ @@ -6612,7 +6612,7 @@
6612 6612
6613 <div class="row mt0 footer"> 6613 <div class="row mt0 footer">
6614 <div class="col-md-6" align="left"> 6614 <div class="col-md-6" align="left">
6615 - Generated on 2019-12-07 14:25:24 </div> 6615 + Generated on 2019-12-07 15:39:18 </div>
6616 <div class="col-md-6" align="right"> 6616 <div class="col-md-6" align="right">
6617 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 6617 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
6618 </div> 6618 </div>