郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 16f0aa026eeb9f11015a626561f3bd16f253ed15 1 个父辈 ec45ea63
1 个管道 的构建 通过 耗费 7 秒

修改支付

内嵌 并排对比
正在显示 4 个修改的文件 包含 125 行增加 和 60 行删除
@@ -2,7 +2,10 @@ @@ -2,7 +2,10 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
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$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" /> 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" />
  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" />
6 </list> 9 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -24,13 +27,16 @@ @@ -24,13 +27,16 @@
24 </component> 27 </component>
25 <component name="FileEditorManager"> 28 <component name="FileEditorManager">
26 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
27 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true"> 30 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
28 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 31 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
29 <provider selected="true" editor-type-id="text-editor"> 32 <provider selected="true" editor-type-id="text-editor">
30 - <state relative-caret-position="453">  
31 - <caret line="52" column="44" lean-forward="false" selection-start-line="52" selection-start-column="44" selection-end-line="52" selection-end-column="44" /> 33 + <state relative-caret-position="233">
  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" />
32 <folding> 35 <folding>
  36 + <element signature="e#366#715#0#PHP" expanded="false" />
  37 + <element signature="e#720#1532#0#PHP" expanded="false" />
33 <element signature="e#1538#1767#0#PHP" expanded="false" /> 38 <element signature="e#1538#1767#0#PHP" expanded="false" />
  39 + <element signature="e#1772#3407#0#PHP" expanded="false" />
34 <element signature="e#3413#3653#0#PHP" expanded="false" /> 40 <element signature="e#3413#3653#0#PHP" expanded="false" />
35 <element signature="e#3658#3893#0#PHP" expanded="false" /> 41 <element signature="e#3658#3893#0#PHP" expanded="false" />
36 <element signature="e#3899#4246#0#PHP" expanded="false" /> 42 <element signature="e#3899#4246#0#PHP" expanded="false" />
@@ -98,13 +104,35 @@ @@ -98,13 +104,35 @@
98 <file leaf-file-name="common.php" pinned="false" current-in-tab="false"> 104 <file leaf-file-name="common.php" pinned="false" current-in-tab="false">
99 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 105 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
100 <provider selected="true" editor-type-id="text-editor"> 106 <provider selected="true" editor-type-id="text-editor">
101 - <state relative-caret-position="183">  
102 - <caret line="1771" column="9" lean-forward="true" selection-start-line="1771" selection-start-column="9" selection-end-line="1771" selection-end-column="9" /> 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" />
103 <folding /> 109 <folding />
104 </state> 110 </state>
105 </provider> 111 </provider>
106 </entry> 112 </entry>
107 </file> 113 </file>
  114 + <file leaf-file-name="OrderController.php" pinned="false" current-in-tab="true">
  115 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  116 + <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" />
  119 + <folding>
  120 + <element signature="e#131#162#0#PHP" expanded="true" />
  121 + <element signature="e#336#608#0#PHP" expanded="false" />
  122 + <element signature="e#614#976#0#PHP" expanded="false" />
  123 + <element signature="e#981#1841#0#PHP" expanded="false" />
  124 + <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" />
  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" />
  131 + </folding>
  132 + </state>
  133 + </provider>
  134 + </entry>
  135 + </file>
108 </leaf> 136 </leaf>
109 </component> 137 </component>
110 <component name="FileTemplateManagerImpl"> 138 <component name="FileTemplateManagerImpl">
@@ -125,7 +153,6 @@ @@ -125,7 +153,6 @@
125 <component name="IdeDocumentHistory"> 153 <component name="IdeDocumentHistory">
126 <option name="CHANGED_PATHS"> 154 <option name="CHANGED_PATHS">
127 <list> 155 <list>
128 - <option value="$PROJECT_DIR$/api/index/model/ShoptypeModel.php" />  
129 <option value="$PROJECT_DIR$/api/index/model/ShoppicModel.php" /> 156 <option value="$PROJECT_DIR$/api/index/model/ShoppicModel.php" />
130 <option value="$PROJECT_DIR$/app/admin/controller/BuildController.php" /> 157 <option value="$PROJECT_DIR$/app/admin/controller/BuildController.php" />
131 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html" /> 158 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/index.html" />
@@ -169,13 +196,14 @@ @@ -169,13 +196,14 @@
169 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" /> 196 <option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
170 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" /> 197 <option value="$PROJECT_DIR$/api/index/controller/ShopgoodsController.php" />
171 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" /> 198 <option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
172 - <option value="$PROJECT_DIR$/api/index/controller/OrderController.php" />  
173 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" /> 199 <option value="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
174 <option value="$PROJECT_DIR$/api/config.php" /> 200 <option value="$PROJECT_DIR$/api/config.php" />
175 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" /> 201 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
176 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" /> 202 <option value="$PROJECT_DIR$/app/admin/controller/PointController.php" />
177 - <option value="$PROJECT_DIR$/simplewind/cmf/common.php" />  
178 <option value="$PROJECT_DIR$/api/index/controller/UserController.php" /> 203 <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" />
179 </list> 207 </list>
180 </option> 208 </option>
181 </component> 209 </component>
@@ -193,11 +221,11 @@ @@ -193,11 +221,11 @@
193 <sorting>DEFINITION_ORDER</sorting> 221 <sorting>DEFINITION_ORDER</sorting>
194 </component> 222 </component>
195 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 223 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
196 - <component name="ProjectFrameBounds">  
197 - <option name="x" value="396" />  
198 - <option name="y" value="104" /> 224 + <component name="ProjectFrameBounds" extendedState="1">
  225 + <option name="x" value="198" />
  226 + <option name="y" value="62" />
199 <option name="width" value="1700" /> 227 <option name="width" value="1700" />
200 - <option name="height" value="1030" /> 228 + <option name="height" value="1039" />
201 </component> 229 </component>
202 <component name="ProjectView"> 230 <component name="ProjectView">
203 <navigator currentView="ProjectPane" proportions="" version="1"> 231 <navigator currentView="ProjectPane" proportions="" version="1">
@@ -214,6 +242,8 @@ @@ -214,6 +242,8 @@
214 <foldersAlwaysOnTop value="true" /> 242 <foldersAlwaysOnTop value="true" />
215 </navigator> 243 </navigator>
216 <panes> 244 <panes>
  245 + <pane id="Scratches" />
  246 + <pane id="Scope" />
217 <pane id="ProjectPane"> 247 <pane id="ProjectPane">
218 <subPane> 248 <subPane>
219 <expand> 249 <expand>
@@ -242,19 +272,36 @@ @@ -242,19 +272,36 @@
242 <path> 272 <path>
243 <item name="scrap" type="b2602c69:ProjectViewProjectNode" /> 273 <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
244 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" /> 274 <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
245 - <item name="public" type="2a2b976b:PhpTreeStructureProvider$1" /> 275 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  276 + </path>
  277 + <path>
  278 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  279 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  280 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  281 + <item name="cmf" type="2a2b976b:PhpTreeStructureProvider$1" />
  282 + </path>
  283 + <path>
  284 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  285 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  286 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  287 + <item name="extend" type="2a2b976b:PhpTreeStructureProvider$1" />
  288 + </path>
  289 + <path>
  290 + <item name="scrap" type="b2602c69:ProjectViewProjectNode" />
  291 + <item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
  292 + <item name="simplewind" type="2a2b976b:PhpTreeStructureProvider$1" />
  293 + <item name="extend" type="2a2b976b:PhpTreeStructureProvider$1" />
  294 + <item name="wxapp" type="2a2b976b:PhpTreeStructureProvider$1" />
246 </path> 295 </path>
247 </expand> 296 </expand>
248 <select /> 297 <select />
249 </subPane> 298 </subPane>
250 </pane> 299 </pane>
251 - <pane id="Scope" />  
252 - <pane id="Scratches" />  
253 </panes> 300 </panes>
254 </component> 301 </component>
255 <component name="PropertiesComponent"> 302 <component name="PropertiesComponent">
256 <property name="WebServerToolWindowFactoryState" value="false" /> 303 <property name="WebServerToolWindowFactoryState" value="false" />
257 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../areial" /> 304 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
258 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 305 <property name="DefaultHtmlFileTemplate" value="HTML File" />
259 </component> 306 </component>
260 <component name="RecentsManager"> 307 <component name="RecentsManager">
@@ -351,18 +398,19 @@ @@ -351,18 +398,19 @@
351 <workItem from="1575444399653" duration="12810000" /> 398 <workItem from="1575444399653" duration="12810000" />
352 <workItem from="1575462840839" duration="250000" /> 399 <workItem from="1575462840839" duration="250000" />
353 <workItem from="1575506248144" duration="15103000" /> 400 <workItem from="1575506248144" duration="15103000" />
354 - <workItem from="1575527294268" duration="9387000" /> 401 + <workItem from="1575527294268" duration="10705000" />
  402 + <workItem from="1575543830603" duration="1158000" />
355 </task> 403 </task>
356 <servers /> 404 <servers />
357 </component> 405 </component>
358 <component name="TimeTrackingManager"> 406 <component name="TimeTrackingManager">
359 - <option name="totallyTimeSpent" value="491199000" /> 407 + <option name="totallyTimeSpent" value="493675000" />
360 </component> 408 </component>
361 <component name="ToolWindowManager"> 409 <component name="ToolWindowManager">
362 - <frame x="396" y="104" width="1700" height="1030" extended-state="0" /> 410 + <frame x="198" y="62" width="1700" height="1039" extended-state="1" />
363 <editor active="true" /> 411 <editor active="true" />
364 <layout> 412 <layout>
365 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 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" />
366 <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" /> 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" />
367 <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" /> 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" />
368 <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" /> 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" />
@@ -628,19 +676,10 @@ @@ -628,19 +676,10 @@
628 </state> 676 </state>
629 </provider> 677 </provider>
630 </entry> 678 </entry>
631 - <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php">  
632 - <provider selected="true" editor-type-id="text-editor">  
633 - <state relative-caret-position="-529">  
634 - <caret line="19" column="20" lean-forward="false" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />  
635 - <folding />  
636 - </state>  
637 - </provider>  
638 - </entry>  
639 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php"> 679 <entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
640 <provider selected="true" editor-type-id="text-editor"> 680 <provider selected="true" editor-type-id="text-editor">
641 <state relative-caret-position="0"> 681 <state relative-caret-position="0">
642 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 682 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
643 - <folding />  
644 </state> 683 </state>
645 </provider> 684 </provider>
646 </entry> 685 </entry>
@@ -681,7 +720,6 @@ @@ -681,7 +720,6 @@
681 <provider selected="true" editor-type-id="text-editor"> 720 <provider selected="true" editor-type-id="text-editor">
682 <state relative-caret-position="158"> 721 <state relative-caret-position="158">
683 <caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" /> 722 <caret line="16" column="77" lean-forward="true" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="77" />
684 - <folding />  
685 </state> 723 </state>
686 </provider> 724 </provider>
687 </entry> 725 </entry>
@@ -818,7 +856,6 @@ @@ -818,7 +856,6 @@
818 <provider selected="true" editor-type-id="text-editor"> 856 <provider selected="true" editor-type-id="text-editor">
819 <state relative-caret-position="0"> 857 <state relative-caret-position="0">
820 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 858 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
821 - <folding />  
822 </state> 859 </state>
823 </provider> 860 </provider>
824 </entry> 861 </entry>
@@ -826,7 +863,6 @@ @@ -826,7 +863,6 @@
826 <provider selected="true" editor-type-id="text-editor"> 863 <provider selected="true" editor-type-id="text-editor">
827 <state relative-caret-position="0"> 864 <state relative-caret-position="0">
828 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 865 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
829 - <folding />  
830 </state> 866 </state>
831 </provider> 867 </provider>
832 </entry> 868 </entry>
@@ -834,7 +870,6 @@ @@ -834,7 +870,6 @@
834 <provider selected="true" editor-type-id="text-editor"> 870 <provider selected="true" editor-type-id="text-editor">
835 <state relative-caret-position="1351"> 871 <state relative-caret-position="1351">
836 <caret line="235" column="11" lean-forward="true" selection-start-line="235" selection-start-column="11" selection-end-line="235" selection-end-column="11" /> 872 <caret line="235" column="11" lean-forward="true" selection-start-line="235" selection-start-column="11" selection-end-line="235" selection-end-column="11" />
837 - <folding />  
838 </state> 873 </state>
839 </provider> 874 </provider>
840 </entry> 875 </entry>
@@ -842,7 +877,6 @@ @@ -842,7 +877,6 @@
842 <provider selected="true" editor-type-id="text-editor"> 877 <provider selected="true" editor-type-id="text-editor">
843 <state relative-caret-position="75"> 878 <state relative-caret-position="75">
844 <caret line="52" column="36" lean-forward="true" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" /> 879 <caret line="52" column="36" lean-forward="true" selection-start-line="52" selection-start-column="36" selection-end-line="52" selection-end-column="36" />
845 - <folding />  
846 </state> 880 </state>
847 </provider> 881 </provider>
848 </entry> 882 </entry>
@@ -859,25 +893,6 @@ @@ -859,25 +893,6 @@
859 </state> 893 </state>
860 </provider> 894 </provider>
861 </entry> 895 </entry>
862 - <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">  
863 - <provider selected="true" editor-type-id="text-editor">  
864 - <state relative-caret-position="176">  
865 - <caret line="17" column="12" lean-forward="true" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />  
866 - <folding>  
867 - <element signature="e#330#602#0#PHP" expanded="false" />  
868 - <element signature="e#608#970#0#PHP" expanded="false" />  
869 - <element signature="e#975#1835#0#PHP" expanded="false" />  
870 - <element signature="e#1841#2078#0#PHP" expanded="false" />  
871 - <element signature="e#2083#2781#0#PHP" expanded="false" />  
872 - <element signature="e#2787#3029#0#PHP" expanded="false" />  
873 - <element signature="e#3035#3272#0#PHP" expanded="false" />  
874 - <element signature="e#3277#3349#0#PHP" expanded="false" />  
875 - <element signature="e#3355#3834#0#PHP" expanded="false" />  
876 - <element signature="e#3839#4406#0#PHP" expanded="false" />  
877 - </folding>  
878 - </state>  
879 - </provider>  
880 - </entry>  
881 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php"> 896 <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
882 <provider selected="true" editor-type-id="text-editor"> 897 <provider selected="true" editor-type-id="text-editor">
883 <state relative-caret-position="174"> 898 <state relative-caret-position="174">
@@ -898,20 +913,31 @@ @@ -898,20 +913,31 @@
898 </state> 913 </state>
899 </provider> 914 </provider>
900 </entry> 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>
  922 + </provider>
  923 + </entry>
901 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 924 <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
902 <provider selected="true" editor-type-id="text-editor"> 925 <provider selected="true" editor-type-id="text-editor">
903 - <state relative-caret-position="183">  
904 - <caret line="1771" column="9" lean-forward="true" selection-start-line="1771" selection-start-column="9" selection-end-line="1771" selection-end-column="9" /> 926 + <state relative-caret-position="802">
  927 + <caret line="1850" column="1" lean-forward="false" selection-start-line="1850" selection-start-column="1" selection-end-line="1850" selection-end-column="1" />
905 <folding /> 928 <folding />
906 </state> 929 </state>
907 </provider> 930 </provider>
908 </entry> 931 </entry>
909 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php"> 932 <entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
910 <provider selected="true" editor-type-id="text-editor"> 933 <provider selected="true" editor-type-id="text-editor">
911 - <state relative-caret-position="453">  
912 - <caret line="52" column="44" lean-forward="false" selection-start-line="52" selection-start-column="44" selection-end-line="52" selection-end-column="44" /> 934 + <state relative-caret-position="233">
  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" />
913 <folding> 936 <folding>
  937 + <element signature="e#366#715#0#PHP" expanded="false" />
  938 + <element signature="e#720#1532#0#PHP" expanded="false" />
914 <element signature="e#1538#1767#0#PHP" expanded="false" /> 939 <element signature="e#1538#1767#0#PHP" expanded="false" />
  940 + <element signature="e#1772#3407#0#PHP" expanded="false" />
915 <element signature="e#3413#3653#0#PHP" expanded="false" /> 941 <element signature="e#3413#3653#0#PHP" expanded="false" />
916 <element signature="e#3658#3893#0#PHP" expanded="false" /> 942 <element signature="e#3658#3893#0#PHP" expanded="false" />
917 <element signature="e#3899#4246#0#PHP" expanded="false" /> 943 <element signature="e#3899#4246#0#PHP" expanded="false" />
@@ -975,5 +1001,25 @@ @@ -975,5 +1001,25 @@
975 </state> 1001 </state>
976 </provider> 1002 </provider>
977 </entry> 1003 </entry>
  1004 + <entry file="file://$PROJECT_DIR$/api/index/controller/OrderController.php">
  1005 + <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" />
  1008 + <folding>
  1009 + <element signature="e#131#162#0#PHP" expanded="true" />
  1010 + <element signature="e#336#608#0#PHP" expanded="false" />
  1011 + <element signature="e#614#976#0#PHP" expanded="false" />
  1012 + <element signature="e#981#1841#0#PHP" expanded="false" />
  1013 + <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" />
  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" />
  1020 + </folding>
  1021 + </state>
  1022 + </provider>
  1023 + </entry>
978 </component> 1024 </component>
979 </project> 1025 </project>
@@ -12,7 +12,8 @@ namespace api\index\controller; @@ -12,7 +12,8 @@ namespace api\index\controller;
12 use api\index\model\OrderModel; 12 use api\index\model\OrderModel;
13 use cmf\controller\RestBaseController; 13 use cmf\controller\RestBaseController;
14 use think\Db; 14 use think\Db;
15 -use think\Validate; 15 +
  16 +use wxapp\pay\WeixinPay;
16 17
17 /** 18 /**
18 * @title 订单 19 * @title 订单
@@ -97,7 +98,7 @@ class OrderController extends RestBaseController @@ -97,7 +98,7 @@ class OrderController extends RestBaseController
97 } 98 }
98 //微信支付 99 //微信支付
99 $openid = $this->getOpenid(); 100 $openid = $this->getOpenid();
100 - $pay = new \WeixinPay(); 101 + $pay = new WeixinPay();
101 $this->success('SUCCESS',$pay->pay($openid['openid'],$data['num'],"废品回收",$data['total'],cmf_api_url('index/pay/notify','','',true))); 102 $this->success('SUCCESS',$pay->pay($openid['openid'],$data['num'],"废品回收",$data['total'],cmf_api_url('index/pay/notify','','',true)));
102 } 103 }
103 104
@@ -1833,3 +1833,19 @@ function generateCode($length = 6) { @@ -1833,3 +1833,19 @@ function generateCode($length = 6) {
1833 $max = pow(10, $length) - 1; 1833 $max = pow(10, $length) - 1;
1834 return rand($min, $max); 1834 return rand($min, $max);
1835 } 1835 }
  1836 +
  1837 +/**
  1838 + * CMF Url生成
  1839 + * @param string $url 路由地址
  1840 + * @param string|array $vars 变量
  1841 + * @param bool|string $suffix 生成的URL后缀
  1842 + * @param bool|string $domain 域名
  1843 + * @return string
  1844 + */
  1845 +function cmf_api_url($url = '', $vars = '', $suffix = true ,$domain = false){
  1846 + $newUrl='/api'.url($url, $vars, $suffix);
  1847 + if($domain){
  1848 + $newUrl='http://'.$_SERVER['HTTP_HOST'].$newUrl;
  1849 + }
  1850 + return $newUrl;
  1851 +}
1 <?php 1 <?php
  2 +
  3 +namespace wxapp\pay;
2 /* 4 /*
3 * 小程序微信支付 5 * 小程序微信支付
4 */ 6 */