郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 66e3ffc8a7d7e5572563d8f6f8dcb41d51bf9155 1 个父辈 16f0aa02
1 个管道 的构建 通过 耗费 9 秒

修改支付

内嵌 并排对比
正在显示 3 个修改的文件 包含 118 行增加 和 105 行删除
@@ -4,8 +4,7 @@ @@ -4,8 +4,7 @@
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
7 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/cmf/common.php" afterPath="$PROJECT_DIR$/simplewind/cmf/common.php" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" afterPath="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" /> 7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/PayController.php" afterPath="$PROJECT_DIR$/api/index/controller/PayController.php" />
9 </list> 8 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
11 <option name="TRACKING_ENABLED" value="true" /> 10 <option name="TRACKING_ENABLED" value="true" />
@@ -30,7 +29,7 @@ @@ -30,7 +29,7 @@
30 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false"> 29 <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
31 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 30 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
32 <provider selected="true" editor-type-id="text-editor"> 31 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="233"> 32 + <state relative-caret-position="0">
34 <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" /> 33 <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
35 <folding> 34 <folding>
36 <element signature="e#366#715#0#PHP" expanded="false" /> 35 <element signature="e#366#715#0#PHP" expanded="false" />
@@ -101,33 +100,41 @@ @@ -101,33 +100,41 @@
101 </provider> 100 </provider>
102 </entry> 101 </entry>
103 </file> 102 </file>
104 - <file leaf-file-name="common.php" pinned="false" current-in-tab="false">  
105 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">  
106 - <provider selected="true" editor-type-id="text-editor">  
107 - <state relative-caret-position="802">  
108 - <caret line="1850" column="1" lean-forward="false" selection-start-line="1850" selection-start-column="1" selection-end-line="1850" selection-end-column="1" />  
109 - <folding />  
110 - </state>  
111 - </provider>  
112 - </entry>  
113 - </file>  
114 - <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true"> 103 + <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="false">
115 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 104 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
116 <provider selected="true" editor-type-id="text-editor"> 105 <provider selected="true" editor-type-id="text-editor">
117 - <state relative-caret-position="427">  
118 - <caret line="74" column="0" lean-forward="true" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" /> 106 + <state relative-caret-position="537">
  107 + <caret line="99" column="37" lean-forward="true" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
119 <folding> 108 <folding>
120 <element signature="e#131#162#0#PHP" expanded="true" /> 109 <element signature="e#131#162#0#PHP" expanded="true" />
121 <element signature="e#336#608#0#PHP" expanded="false" /> 110 <element signature="e#336#608#0#PHP" expanded="false" />
122 <element signature="e#614#976#0#PHP" expanded="false" /> 111 <element signature="e#614#976#0#PHP" expanded="false" />
123 <element signature="e#981#1841#0#PHP" expanded="false" /> 112 <element signature="e#981#1841#0#PHP" expanded="false" />
124 <element signature="e#1847#2084#0#PHP" expanded="false" /> 113 <element signature="e#1847#2084#0#PHP" expanded="false" />
125 - <element signature="e#2089#2786#0#PHP" expanded="false" />  
126 <element signature="e#2792#3034#0#PHP" expanded="false" /> 114 <element signature="e#2792#3034#0#PHP" expanded="false" />
127 - <element signature="e#3040#3277#0#PHP" expanded="false" />  
128 - <element signature="e#3282#3354#0#PHP" expanded="false" />  
129 - <element signature="e#3360#3839#0#PHP" expanded="false" />  
130 - <element signature="e#3844#4411#0#PHP" expanded="false" /> 115 + <element signature="e#3040#3378#0#PHP" expanded="false" />
  116 + <element signature="e#4261#4740#0#PHP" expanded="false" />
  117 + <element signature="e#4745#5312#0#PHP" expanded="false" />
  118 + </folding>
  119 + </state>
  120 + </provider>
  121 + </entry>
  122 + </file>
  123 + <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
  124 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  125 + <provider selected="true" editor-type-id="text-editor">
  126 + <state relative-caret-position="-36">
  127 + <caret line="65" column="28" lean-forward="false" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
  128 + <folding>
  129 + <element signature="e#324#855#0#PHP" expanded="false" />
  130 + <element signature="e#861#925#0#PHP" expanded="false" />
  131 + <element signature="e#930#1763#0#PHP" expanded="false" />
  132 + <element signature="e#1769#1850#0#PHP" expanded="false" />
  133 + <element signature="e#1855#3845#0#PHP" expanded="false" />
  134 + <element signature="e#3852#3875#0#PHP" expanded="false" />
  135 + <element signature="e#3880#4139#0#PHP" expanded="false" />
  136 + <element signature="e#4146#4195#0#PHP" expanded="false" />
  137 + <element signature="e#4200#4628#0#PHP" expanded="false" />
131 </folding> 138 </folding>
132 </state> 139 </state>
133 </provider> 140 </provider>
@@ -190,7 +197,6 @@ @@ -190,7 +197,6 @@
190 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" /> 197 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shoporder/edit.html" />
191 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" /> 198 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/index.html" />
192 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" /> 199 <option value="$PROJECT_DIR$/api/index/model/ShopgoodsModel.php" />
193 - <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />  
194 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" /> 200 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subhome/edit.html" />
195 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" /> 201 <option value="$PROJECT_DIR$/app/admin/controller/SubhomeController.php" />
196 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 202 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
@@ -201,9 +207,10 @@ @@ -201,9 +207,10 @@
201 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 207 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
202 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 208 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
203 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 209 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
204 - <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />  
205 - <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />  
206 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" /> 210 <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />
  211 + <option value="$PROJECT_DIR$/api/index/controller/PayController.php" />
  212 + <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />
  213 + <option value="$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php" />
207 </list> 214 </list>
208 </option> 215 </option>
209 </component> 216 </component>
@@ -222,10 +229,10 @@ @@ -222,10 +229,10 @@
222 </component> 229 </component>
223 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 230 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
224 <component name="ProjectFrameBounds" extendedState="1"> 231 <component name="ProjectFrameBounds" extendedState="1">
225 - <option name="x" value="198" />  
226 - <option name="y" value="62" />  
227 - <option name="width" value="1700" />  
228 - <option name="height" value="1039" /> 232 + <option name="x" value="59" />
  233 + <option name="y" value="96" />
  234 + <option name="width" value="1814" />
  235 + <option name="height" value="1009" />
229 </component> 236 </component>
230 <component name="ProjectView"> 237 <component name="ProjectView">
231 <navigator currentView="ProjectPane" proportions="" version="1"> 238 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -242,8 +249,6 @@ @@ -242,8 +249,6 @@
242 <foldersAlwaysOnTop value="true" /> 249 <foldersAlwaysOnTop value="true" />
243 </navigator> 250 </navigator>
244 <panes> 251 <panes>
245 - <pane id="Scratches" />  
246 - <pane id="Scope" />  
247 <pane id="ProjectPane"> 252 <pane id="ProjectPane">
248 <subPane> 253 <subPane>
249 <expand> 254 <expand>
@@ -297,11 +302,13 @@ @@ -297,11 +302,13 @@
297 <select /> 302 <select />
298 </subPane> 303 </subPane>
299 </pane> 304 </pane>
  305 + <pane id="Scope" />
  306 + <pane id="Scratches" />
300 </panes> 307 </panes>
301 </component> 308 </component>
302 <component name="PropertiesComponent"> 309 <component name="PropertiesComponent">
303 <property name="WebServerToolWindowFactoryState" value="false" /> 310 <property name="WebServerToolWindowFactoryState" value="false" />
304 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" /> 311 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../hotel" />
305 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 312 <property name="DefaultHtmlFileTemplate" value="HTML File" />
306 </component> 313 </component>
307 <component name="RecentsManager"> 314 <component name="RecentsManager">
@@ -399,18 +406,19 @@ @@ -399,18 +406,19 @@
399 <workItem from="1575462840839" duration="250000" /> 406 <workItem from="1575462840839" duration="250000" />
400 <workItem from="1575506248144" duration="15103000" /> 407 <workItem from="1575506248144" duration="15103000" />
401 <workItem from="1575527294268" duration="10705000" /> 408 <workItem from="1575527294268" duration="10705000" />
402 - <workItem from="1575543830603" duration="1158000" /> 409 + <workItem from="1575543830603" duration="2980000" />
  410 + <workItem from="1575592067577" duration="3070000" />
403 </task> 411 </task>
404 <servers /> 412 <servers />
405 </component> 413 </component>
406 <component name="TimeTrackingManager"> 414 <component name="TimeTrackingManager">
407 - <option name="totallyTimeSpent" value="493675000" /> 415 + <option name="totallyTimeSpent" value="498567000" />
408 </component> 416 </component>
409 <component name="ToolWindowManager"> 417 <component name="ToolWindowManager">
410 - <frame x="198" y="62" width="1700" height="1039" extended-state="1" /> 418 + <frame x="59" y="96" width="1814" height="1009" extended-state="1" />
411 <editor active="true" /> 419 <editor active="true" />
412 <layout> 420 <layout>
413 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16524391" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 421 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15621437" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
414 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 422 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
415 <window_info id="Event Log" 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="7" side_tool="true" content_ui="tabs" /> 423 <window_info id="Event Log" 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="7" side_tool="true" content_ui="tabs" />
416 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 424 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -461,13 +469,6 @@ @@ -461,13 +469,6 @@
461 <watches-manager /> 469 <watches-manager />
462 </component> 470 </component>
463 <component name="editorHistoryManager"> 471 <component name="editorHistoryManager">
464 - <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">  
465 - <provider selected="true" editor-type-id="text-editor">  
466 - <state relative-caret-position="595">  
467 - <caret line="338" column="7" lean-forward="true" selection-start-line="338" selection-start-column="7" selection-end-line="338" selection-end-column="7" />  
468 - </state>  
469 - </provider>  
470 - </entry>  
471 <entry file="file://$PROJECT_DIR$/app/admin/controller/RecycleController.php"> 472 <entry file="file://$PROJECT_DIR$/app/admin/controller/RecycleController.php">
472 <provider selected="true" editor-type-id="text-editor"> 473 <provider selected="true" editor-type-id="text-editor">
473 <state relative-caret-position="180"> 474 <state relative-caret-position="180">
@@ -651,12 +652,6 @@ @@ -651,12 +652,6 @@
651 <provider selected="true" editor-type-id="text-editor"> 652 <provider selected="true" editor-type-id="text-editor">
652 <state relative-caret-position="0"> 653 <state relative-caret-position="0">
653 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 654 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
654 - <folding>  
655 - <element signature="e#266#1001#0#PHP" expanded="false" />  
656 - <element signature="e#1016#2171#0#PHP" expanded="false" />  
657 - <element signature="e#2186#3928#0#PHP" expanded="false" />  
658 - <element signature="e#3943#4413#0#PHP" expanded="false" />  
659 - </folding>  
660 </state> 655 </state>
661 </provider> 656 </provider>
662 </entry> 657 </entry>
@@ -701,10 +696,6 @@ @@ -701,10 +696,6 @@
701 <provider selected="true" editor-type-id="text-editor"> 696 <provider selected="true" editor-type-id="text-editor">
702 <state relative-caret-position="325"> 697 <state relative-caret-position="325">
703 <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" /> 698 <caret line="52" column="26" lean-forward="false" selection-start-line="52" selection-start-column="26" selection-end-line="52" selection-end-column="26" />
704 - <folding>  
705 - <element signature="e#243#1652#0#PHP" expanded="false" />  
706 - <element signature="e#1669#3046#0#PHP" expanded="false" />  
707 - </folding>  
708 </state> 699 </state>
709 </provider> 700 </provider>
710 </entry> 701 </entry>
@@ -837,10 +828,6 @@ @@ -837,10 +828,6 @@
837 <provider selected="true" editor-type-id="text-editor"> 828 <provider selected="true" editor-type-id="text-editor">
838 <state relative-caret-position="725"> 829 <state relative-caret-position="725">
839 <caret line="114" column="12" lean-forward="false" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" /> 830 <caret line="114" column="12" lean-forward="false" selection-start-line="114" selection-start-column="12" selection-end-line="114" selection-end-column="12" />
840 - <folding>  
841 - <element signature="e#265#1638#0#PHP" expanded="false" />  
842 - <element signature="e#1655#3619#0#PHP" expanded="false" />  
843 - </folding>  
844 </state> 831 </state>
845 </provider> 832 </provider>
846 </entry> 833 </entry>
@@ -884,40 +871,6 @@ @@ -884,40 +871,6 @@
884 <provider selected="true" editor-type-id="text-editor"> 871 <provider selected="true" editor-type-id="text-editor">
885 <state relative-caret-position="400"> 872 <state relative-caret-position="400">
886 <caret line="76" column="0" lean-forward="false" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" /> 873 <caret line="76" column="0" lean-forward="false" selection-start-line="76" selection-start-column="0" selection-end-line="76" selection-end-column="0" />
887 - <folding>  
888 - <element signature="e#262#867#0#PHP" expanded="false" />  
889 - <element signature="e#882#2069#0#PHP" expanded="false" />  
890 - <element signature="e#2084#3731#0#PHP" expanded="false" />  
891 - <element signature="e#3746#4212#0#PHP" expanded="false" />  
892 - </folding>  
893 - </state>  
894 - </provider>  
895 - </entry>  
896 - <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">  
897 - <provider selected="true" editor-type-id="text-editor">  
898 - <state relative-caret-position="174">  
899 - <caret line="16" column="23" lean-forward="true" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />  
900 - <folding>  
901 - <element signature="e#324#855#0#PHP" expanded="false" />  
902 - <element signature="e#861#925#0#PHP" expanded="false" />  
903 - <element signature="e#930#1766#0#PHP" expanded="false" />  
904 - <element signature="e#1772#1853#0#PHP" expanded="false" />  
905 - <element signature="e#1858#3848#0#PHP" expanded="false" />  
906 - <element signature="e#3855#3878#0#PHP" expanded="false" />  
907 - <element signature="e#3883#4142#0#PHP" expanded="false" />  
908 - <element signature="e#4149#4198#0#PHP" expanded="false" />  
909 - <element signature="e#4203#4631#0#PHP" expanded="false" />  
910 - <element signature="e#4637#4701#0#PHP" expanded="false" />  
911 - <element signature="e#4706#5580#0#PHP" expanded="false" />  
912 - </folding>  
913 - </state>  
914 - </provider>  
915 - </entry>  
916 - <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">  
917 - <provider selected="true" editor-type-id="text-editor">  
918 - <state relative-caret-position="292">  
919 - <caret line="15" column="13" lean-forward="false" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />  
920 - <folding />  
921 </state> 874 </state>
922 </provider> 875 </provider>
923 </entry> 876 </entry>
@@ -931,7 +884,7 @@ @@ -931,7 +884,7 @@
931 </entry> 884 </entry>
932 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 885 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
933 <provider selected="true" editor-type-id="text-editor"> 886 <provider selected="true" editor-type-id="text-editor">
934 - <state relative-caret-position="233"> 887 + <state relative-caret-position="0">
935 <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" /> 888 <caret line="37" column="27" lean-forward="false" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
936 <folding> 889 <folding>
937 <element signature="e#366#715#0#PHP" expanded="false" /> 890 <element signature="e#366#715#0#PHP" expanded="false" />
@@ -1001,22 +954,58 @@ @@ -1001,22 +954,58 @@
1001 </state> 954 </state>
1002 </provider> 955 </provider>
1003 </entry> 956 </entry>
  957 + <entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php">
  958 + <provider selected="true" editor-type-id="text-editor">
  959 + <state relative-caret-position="291">
  960 + <caret line="63" column="61" lean-forward="false" selection-start-line="63" selection-start-column="61" selection-end-line="63" selection-end-column="61" />
  961 + <folding />
  962 + </state>
  963 + </provider>
  964 + </entry>
  965 + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">
  966 + <provider selected="true" editor-type-id="text-editor">
  967 + <state relative-caret-position="97">
  968 + <caret line="104" column="21" lean-forward="false" selection-start-line="104" selection-start-column="21" selection-end-line="104" selection-end-column="21" />
  969 + <folding>
  970 + <element signature="e#4049#4323#0#PHP" expanded="false" />
  971 + <element signature="e#4342#4805#0#PHP" expanded="false" />
  972 + <element signature="e#4835#5267#0#PHP" expanded="false" />
  973 + </folding>
  974 + </state>
  975 + </provider>
  976 + </entry>
1004 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php"> 977 <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
1005 <provider selected="true" editor-type-id="text-editor"> 978 <provider selected="true" editor-type-id="text-editor">
1006 - <state relative-caret-position="427">  
1007 - <caret line="74" column="0" lean-forward="true" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" /> 979 + <state relative-caret-position="537">
  980 + <caret line="99" column="37" lean-forward="true" selection-start-line="99" selection-start-column="37" selection-end-line="99" selection-end-column="37" />
1008 <folding> 981 <folding>
1009 <element signature="e#131#162#0#PHP" expanded="true" /> 982 <element signature="e#131#162#0#PHP" expanded="true" />
1010 <element signature="e#336#608#0#PHP" expanded="false" /> 983 <element signature="e#336#608#0#PHP" expanded="false" />
1011 <element signature="e#614#976#0#PHP" expanded="false" /> 984 <element signature="e#614#976#0#PHP" expanded="false" />
1012 <element signature="e#981#1841#0#PHP" expanded="false" /> 985 <element signature="e#981#1841#0#PHP" expanded="false" />
1013 <element signature="e#1847#2084#0#PHP" expanded="false" /> 986 <element signature="e#1847#2084#0#PHP" expanded="false" />
1014 - <element signature="e#2089#2786#0#PHP" expanded="false" />  
1015 <element signature="e#2792#3034#0#PHP" expanded="false" /> 987 <element signature="e#2792#3034#0#PHP" expanded="false" />
1016 - <element signature="e#3040#3277#0#PHP" expanded="false" />  
1017 - <element signature="e#3282#3354#0#PHP" expanded="false" />  
1018 - <element signature="e#3360#3839#0#PHP" expanded="false" />  
1019 - <element signature="e#3844#4411#0#PHP" expanded="false" /> 988 + <element signature="e#3040#3378#0#PHP" expanded="false" />
  989 + <element signature="e#4261#4740#0#PHP" expanded="false" />
  990 + <element signature="e#4745#5312#0#PHP" expanded="false" />
  991 + </folding>
  992 + </state>
  993 + </provider>
  994 + </entry>
  995 + <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
  996 + <provider selected="true" editor-type-id="text-editor">
  997 + <state relative-caret-position="-36">
  998 + <caret line="65" column="28" lean-forward="false" selection-start-line="65" selection-start-column="28" selection-end-line="65" selection-end-column="28" />
  999 + <folding>
  1000 + <element signature="e#324#855#0#PHP" expanded="false" />
  1001 + <element signature="e#861#925#0#PHP" expanded="false" />
  1002 + <element signature="e#930#1763#0#PHP" expanded="false" />
  1003 + <element signature="e#1769#1850#0#PHP" expanded="false" />
  1004 + <element signature="e#1855#3845#0#PHP" expanded="false" />
  1005 + <element signature="e#3852#3875#0#PHP" expanded="false" />
  1006 + <element signature="e#3880#4139#0#PHP" expanded="false" />
  1007 + <element signature="e#4146#4195#0#PHP" expanded="false" />
  1008 + <element signature="e#4200#4628#0#PHP" expanded="false" />
1020 </folding> 1009 </folding>
1021 </state> 1010 </state>
1022 </provider> 1011 </provider>
@@ -116,17 +116,42 @@ class OrderController extends RestBaseController @@ -116,17 +116,42 @@ class OrderController extends RestBaseController
116 /** 116 /**
117 * @title 提现 117 * @title 提现
118 * @author Guosheng 118 * @author Guosheng
119 - * @url /index/order/pay 119 + * @url /index/order/deposit
120 * @method GET 120 * @method GET
121 * 121 *
122 * @header name:XX-Token require:1 default: desc:token 122 * @header name:XX-Token require:1 default: desc:token
123 * 123 *
124 - * @param name:order_id type:int require:1 other: desc:订单id 124 + * @param name:money_id type:int require:1 other: desc:提现id
  125 + * @param name:total type:int require:1 other: desc:提现金额
  126 + *
  127 + * @return order_id:订单id
125 */ 128 */
126 public function deposit() 129 public function deposit()
127 { 130 {
128 - $id = $this->getUserId();  
129 - 131 + $user_id = $this->getUserId();
  132 + $total = $this->request->param('total');
  133 + $money_id = $this->request->param('money_id');
  134 + if(empty($total)){
  135 + $this->error(['code'=>40005,'msg'=>'缺少必要参数']);
  136 + }
  137 + if(empty($money_id)){
  138 + $this->error(['code'=>40005,'msg'=>'缺少必要参数']);
  139 + }
  140 + if($total<=1){
  141 + $this->error('非法操作');
  142 + }
  143 + $arr['num'] = cmf_get_order_sn();
  144 + $arr['user_id'] = $user_id;
  145 + $arr['money_id'] = $money_id;
  146 + $arr['total'] = $total;
  147 + $arr['create_time'] = time();
  148 + $result = Db::name('tixian')
  149 + ->insertGetId($arr);
  150 + if(empty($result)){
  151 + $this->error(['code'=>40006,'msg'=>'sql执行失败']);
  152 + }else{
  153 + $this->success('SUCCESS',['order_id'=>$result]);
  154 + }
130 } 155 }
131 156
132 /** 157 /**
@@ -43,7 +43,7 @@ class PayController extends HomeBaseController @@ -43,7 +43,7 @@ class PayController extends HomeBaseController
43 'body' => '废品回收', 43 'body' => '废品回收',
44 'detail' => '站内充值', 44 'detail' => '站内充值',
45 'out_trade_no' => $data['num'], 45 'out_trade_no' => $data['num'],
46 - 'total_fee' => $data['total'] * 100, // 单位：分 46 + 'total_fee' => $data['total']*100, // 单位：分
47 'notify_url' => cmf_api_url('index/pay/notify', '', '', true), // 支付结果通知网址，如果不设置则会使用配置里的默认地址 47 'notify_url' => cmf_api_url('index/pay/notify', '', '', true), // 支付结果通知网址，如果不设置则会使用配置里的默认地址
48 'openid' => $data['openid'], // trade_type=JSAPI，此参数必传，用户在商户appid下的唯一标识， 48 'openid' => $data['openid'], // trade_type=JSAPI，此参数必传，用户在商户appid下的唯一标识，
49 ]; 49 ];
@@ -57,7 +57,6 @@ class PayController extends HomeBaseController @@ -57,7 +57,6 @@ class PayController extends HomeBaseController
57 } else { 57 } else {
58 $this->error('支付参数错误', '', $result); 58 $this->error('支付参数错误', '', $result);
59 } 59 }
60 -  
61 } 60 }
62 61
63 /** 62 /**
@@ -161,7 +160,7 @@ class PayController extends HomeBaseController @@ -161,7 +160,7 @@ class PayController extends HomeBaseController
161 'check_name' => 'NO_CHECK', //文档中有三种校验实名的方法 NO_CHECK OPTION_CHECK FORCE_CHECK 160 'check_name' => 'NO_CHECK', //文档中有三种校验实名的方法 NO_CHECK OPTION_CHECK FORCE_CHECK
162 're_user_name'=>'', //OPTION_CHECK FORCE_CHECK 校验实名的时候必须提交 161 're_user_name'=>'', //OPTION_CHECK FORCE_CHECK 校验实名的时候必须提交
163 'amount' => (1-0.006)*$data['total']*100, //单位为分 162 'amount' => (1-0.006)*$data['total']*100, //单位为分
164 - 'desc' => '提现', 163 + 'desc' => '提现到零钱',
165 'spbill_create_ip' => '192.168.0.1', //发起交易的IP地址 164 'spbill_create_ip' => '192.168.0.1', //发起交易的IP地址
166 ]; 165 ];
167 $app = new Application($this->options); 166 $app = new Application($this->options);