切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
22160ee81addcee6fdcb070f924472dc72f06607
1 个父辈
490de3d2
1 个管道 的构建
通过
耗费 6 秒
修改支付
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
68 行增加
和
113 行删除
.idea/workspace.xml
api/index/controller/OrderController.php
.idea/workspace.xml
查看文件 @
22160ee
...
...
@@ -3,7 +3,7 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"0011664b-87e9-41bd-9f37-18792fb15777"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/
UserController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/Us
erController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/
OrderController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/Ord
erController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -25,78 +25,34 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"UserController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<file
leaf-file-name=
"PayController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/PayController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"528"
column=
"7"
lean-forward=
"true"
selection-start-line=
"528"
selection-start-column=
"7"
selection-end-line=
"528"
selection-end-column=
"7"
/>
<state
relative-caret-position=
"1469"
>
<caret
line=
"87"
column=
"30"
lean-forward=
"true"
selection-start-line=
"87"
selection-start-column=
"30"
selection-end-line=
"87"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1614#1872#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1877#2260#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2266#2495#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2500#4135#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4141#4381#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4386#4621#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4627#4974#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4979#5425#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5431#5691#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5696#5897#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5903#6165#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6170#6375#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6381#6860#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6865#9088#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9111#9642#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9648#9928#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9933#10325#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10331#10615#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10620#11565#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11571#11859#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11864#12803#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12809#13390#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13395#15063#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15069#15525#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#15530#17598#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17621#17976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17982#18695#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18700#20157#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20163#20624#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#20629#23756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#23762#24371#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#24376#25661#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#25667#26024#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26029#27012#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27018#27370#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27375#28484#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28490#28845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28850#30277#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30283#30707#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30712#31323#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31329#31825#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31830#35192#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32632#33759#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35198#35482#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35487#36123#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36144#36463#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36469#36877#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#36883#37642#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#37661#38525#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38551#38951#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38974#39547#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#39570#40380#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40386#40985#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40990#41954#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41960#42627#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#42632#43673#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43679#44342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#44347#45374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45381#45812#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45817#46395#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46401#46830#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46835#47437#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47443#47870#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#47875#48441#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#947#1011#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1016#1849#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"OrderController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"506"
>
<caret
line=
"107"
column=
"14"
lean-forward=
"true"
selection-start-line=
"107"
selection-start-column=
"14"
selection-end-line=
"107"
selection-end-column=
"14"
/>
<folding>
<element
signature=
"e#336#608#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#614#976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#981#2020#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2026#2263#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3055#3364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3369#5259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5267#5746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5751#6318#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6324#6577#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -160,7 +116,6 @@
<option
value=
"$PROJECT_DIR$/api/config.php"
/>
<option
value=
"$PROJECT_DIR$/simplewind/cmf/common.php"
/>
<option
value=
"$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/FeeController.php"
/>
<option
value=
"$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/bounty/index.html"
/>
...
...
@@ -173,6 +128,7 @@
<option
value=
"$PROJECT_DIR$/app/admin/controller/PointController.php"
/>
<option
value=
"$PROJECT_DIR$/app/admin/controller/ShoporderController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
</list>
</option>
</component>
...
...
@@ -190,9 +146,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"404"
/>
<option
name=
"y"
value=
"72"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"278"
/>
<option
name=
"y"
value=
"124"
/>
<option
name=
"width"
value=
"1618"
/>
<option
name=
"height"
value=
"1007"
/>
</component>
...
...
@@ -246,7 +202,7 @@
</component>
<component
name=
"PropertiesComponent"
>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$/../../micro"
/>
<property
name=
"last_opened_file_path"
value=
"$PROJECT_DIR$/../../
fastadmin/
micro"
/>
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
</component>
<component
name=
"RecentsManager"
>
...
...
@@ -353,18 +309,18 @@
<workItem
from=
"1576049946357"
duration=
"1233000"
/>
<workItem
from=
"1576056936489"
duration=
"7947000"
/>
<workItem
from=
"1576066696521"
duration=
"5462000"
/>
<workItem
from=
"1576110549014"
duration=
"
3737
000"
/>
<workItem
from=
"1576110549014"
duration=
"
6334
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"54
7012
000"
/>
<option
name=
"totallyTimeSpent"
value=
"54
9609
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
404"
y=
"72"
width=
"1618"
height=
"1007"
extended-state=
"0
"
/>
<frame
x=
"
278"
y=
"124"
width=
"1618"
height=
"1007"
extended-state=
"1
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
true"
show_stripe_button=
"true"
weight=
"0.1508344
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"
false"
show_stripe_button=
"true"
weight=
"0.21116817
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<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"
/>
<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"
/>
...
...
@@ -778,36 +734,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/PayController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1259"
>
<caret
line=
"87"
column=
"30"
lean-forward=
"true"
selection-start-line=
"87"
selection-start-column=
"30"
selection-end-line=
"87"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"e#947#1011#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1016#1849#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"525"
>
<caret
line=
"91"
column=
"26"
lean-forward=
"false"
selection-start-line=
"91"
selection-start-column=
"26"
selection-end-line=
"91"
selection-end-column=
"26"
/>
<folding>
<element
signature=
"e#336#608#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#614#976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#981#2020#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2026#2263#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2268#3059#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3065#3374#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3379#5269#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5277#5756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5761#6328#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6334#6587#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/app/admin/controller/PointController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"425"
>
...
...
@@ -836,8 +762,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/UserController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"230"
>
<caret
line=
"528"
column=
"7"
lean-forward=
"true"
selection-start-line=
"528"
selection-start-column=
"7"
selection-end-line=
"528"
selection-end-column=
"7"
/>
<state
relative-caret-position=
"1750"
>
<caret
line=
"839"
column=
"0"
lean-forward=
"true"
selection-start-line=
"839"
selection-start-column=
"0"
selection-end-line=
"839"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#366#791#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#796#1608#0#PHP"
expanded=
"false"
/>
...
...
@@ -909,5 +835,34 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/PayController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1469"
>
<caret
line=
"87"
column=
"30"
lean-forward=
"true"
selection-start-line=
"87"
selection-start-column=
"30"
selection-end-line=
"87"
selection-end-column=
"30"
/>
<folding>
<element
signature=
"e#947#1011#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1016#1849#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"506"
>
<caret
line=
"107"
column=
"14"
lean-forward=
"true"
selection-start-line=
"107"
selection-start-column=
"14"
selection-end-line=
"107"
selection-end-column=
"14"
/>
<folding>
<element
signature=
"e#336#608#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#614#976#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#981#2020#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2026#2263#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3055#3364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3369#5259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5267#5746#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5751#6318#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6324#6577#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/OrderController.php
查看文件 @
22160ee
...
...
@@ -108,7 +108,7 @@ class OrderController extends RestBaseController
//微信支付
$openid
=
$this
->
getOpenid
();
$pay
=
new
WeixinPay
();
$this
->
success
(
'SUCCESS'
,
$pay
->
pay
(
$openid
[
'openid'
]
,
$data
[
'num'
],
"废品回收"
,
$data
[
'total'
],
cmf_api_url
(
'index/pay/notify'
,
''
,
''
,
true
)));
$this
->
success
(
'SUCCESS'
,
$pay
->
pay
(
$openid
,
$data
[
'num'
],
"废品回收"
,
$data
[
'total'
],
cmf_api_url
(
'index/pay/notify'
,
''
,
''
,
true
)));
}
/**
...
...
请
注册
或
登录
后发表评论