切换导航条
此项目
正在载入...
登录
郭盛
/
scrap
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
dc2377fb64480b7ec0d05b7a86e3bca5c329059a
1 个父辈
2dd4daac
1 个管道 的构建
通过
耗费 8 秒
修改提现金额
变更
2
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
90 行增加
和
85 行删除
.idea/workspace.xml
api/index/controller/PayController.php
.idea/workspace.xml
查看文件 @
dc2377f
...
...
@@ -2,7 +2,8 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"0011664b-87e9-41bd-9f37-18792fb15777"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/RecycleController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/RecycleController.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/api/index/controller/PayController.php"
afterPath=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -24,44 +25,44 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"RecycleController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/RecycleController.php"
>
<file
leaf-file-name=
"OrderController.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/OrderController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"182"
>
<caret
line=
"200"
column=
"35"
lean-forward=
"true"
selection-start-line=
"200"
selection-start-column=
"35"
selection-end-line=
"200"
selection-end-column=
"35"
/>
<state
relative-caret-position=
"250"
>
<caret
line=
"152"
column=
"51"
lean-forward=
"true"
selection-start-line=
"152"
selection-start-column=
"51"
selection-end-line=
"152"
selection-end-column=
"51"
/>
<folding>
<element
signature=
"e#342#596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#601#886#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#892#1227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1232#1729#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1735#1995#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2000#2289#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2295#2634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2639#3142#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3148#3364#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3369#3738#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3744#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4051#4450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4456#4653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4855#5051#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5056#5318#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5324#5779#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5784#6448#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6454#6797#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6802#7283#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7289#7580#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7585#7936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#7942#8295#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8300#8705#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8711#9094#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9099#9766#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9772#10216#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10221#11068#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11074#11342#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11347#11819#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11825#12131#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12136#13779#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#13800#14119#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<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#5277#5756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5761#6328#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"PayController.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/PayController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"654"
>
<caret
line=
"157"
column=
"33"
lean-forward=
"false"
selection-start-line=
"157"
selection-start-column=
"33"
selection-end-line=
"157"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#40#78#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#324#941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#947#1011#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1016#1849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1855#1936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1941#3993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4000#4023#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4028#4287#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4294#4343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4348#4776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4783#4847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4852#5588#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
...
...
@@ -135,9 +136,9 @@
<option
value=
"$PROJECT_DIR$/simplewind/cmf/common.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/UserController.php"
/>
<option
value=
"$PROJECT_DIR$/simplewind/extend/wxapp/pay/WeixinPay.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/OrderController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/RecycleController.php"
/>
<option
value=
"$PROJECT_DIR$/api/index/controller/PayController.php"
/>
</list>
</option>
</component>
...
...
@@ -155,11 +156,11 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"8"
/>
<option
name=
"y"
value=
"102"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"234"
/>
<option
name=
"y"
value=
"79"
/>
<option
name=
"width"
value=
"1618"
/>
<option
name=
"height"
value=
"10
23
"
/>
<option
name=
"height"
value=
"10
16
"
/>
</component>
<component
name=
"ProjectView"
>
<navigator
currentView=
"ProjectPane"
proportions=
""
version=
"1"
>
...
...
@@ -311,15 +312,15 @@
<workItem
from=
"1575527294268"
duration=
"10705000"
/>
<workItem
from=
"1575543830603"
duration=
"2980000"
/>
<workItem
from=
"1575592067577"
duration=
"15900000"
/>
<workItem
from=
"1575615529386"
duration=
"
6506
000"
/>
<workItem
from=
"1575615529386"
duration=
"
9701
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"5
17903
000"
/>
<option
name=
"totallyTimeSpent"
value=
"5
21098
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"
8"
y=
"102"
width=
"1618"
height=
"1023"
extended-state=
"1
"
/>
<frame
x=
"
234"
y=
"79"
width=
"1618"
height=
"1016"
extended-state=
"0
"
/>
<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.22978178"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
...
...
@@ -842,47 +843,10 @@
</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=
"25"
>
<caret
line=
"146"
column=
"0"
lean-forward=
"false"
selection-start-line=
"146"
selection-start-column=
"0"
selection-end-line=
"147"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<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#5277#5756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5761#6328#0#PHP"
expanded=
"false"
/>
</folding>
</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=
"336"
>
<caret
line=
"159"
column=
"47"
lean-forward=
"true"
selection-start-line=
"159"
selection-start-column=
"47"
selection-end-line=
"159"
selection-end-column=
"47"
/>
<folding>
<element
signature=
"e#40#78#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#947#1011#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1016#1849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1855#1936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1941#3993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4000#4023#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4028#4287#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4294#4343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4348#4776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4783#4847#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/api/index/controller/RecycleController.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"182"
>
<caret
line=
"200"
column=
"35"
lean-forward=
"true"
selection-start-line=
"200"
selection-start-column=
"35"
selection-end-line=
"200"
selection-end-column=
"35"
/>
<state
relative-caret-position=
"136"
>
<caret
line=
"197"
column=
"28"
lean-forward=
"false"
selection-start-line=
"197"
selection-start-column=
"28"
selection-end-line=
"197"
selection-end-column=
"28"
/>
<folding>
<element
signature=
"e#342#596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#601#886#0#PHP"
expanded=
"false"
/>
...
...
@@ -897,6 +861,7 @@
<element
signature=
"e#3744#4046#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4051#4450#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4456#4653#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4658#4849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4855#5051#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5056#5318#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5324#5779#0#PHP"
expanded=
"false"
/>
...
...
@@ -920,5 +885,44 @@
</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=
"250"
>
<caret
line=
"152"
column=
"51"
lean-forward=
"true"
selection-start-line=
"152"
selection-start-column=
"51"
selection-end-line=
"152"
selection-end-column=
"51"
/>
<folding>
<element
signature=
"e#131#162#0#PHP"
expanded=
"true"
/>
<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#5277#5756#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5761#6328#0#PHP"
expanded=
"false"
/>
</folding>
</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=
"654"
>
<caret
line=
"157"
column=
"33"
lean-forward=
"false"
selection-start-line=
"157"
selection-start-column=
"33"
selection-end-line=
"157"
selection-end-column=
"33"
/>
<folding>
<element
signature=
"e#40#78#0#PHP"
expanded=
"true"
/>
<element
signature=
"e#324#941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#947#1011#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1016#1849#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1855#1936#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1941#3993#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4000#4023#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4028#4287#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4294#4343#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4348#4776#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4783#4847#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4852#5588#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
api/index/controller/PayController.php
查看文件 @
dc2377f
...
...
@@ -157,6 +157,7 @@ class PayController extends HomeBaseController
*/
public
function
tixian
(
$data
)
{
$money
=
ceil
((
1
-
0.006
)
*
$data
[
'total'
]
*
100
);
$app
=
new
Application
(
$this
->
options
);
$merchantPay
=
$app
->
merchant_pay
;
$merchantPayData
=
[
...
...
@@ -164,7 +165,7 @@ class PayController extends HomeBaseController
'openid'
=>
$data
[
'openid'
],
//收款人的openid
'check_name'
=>
'NO_CHECK'
,
//文档中有三种校验实名的方法 NO_CHECK OPTION_CHECK FORCE_CHECK
're_user_name'
=>
''
,
//OPTION_CHECK FORCE_CHECK 校验实名的时候必须提交
'amount'
=>
(
1
-
0.006
)
*
$data
[
'total'
]
*
100
,
//单位为分
'amount'
=>
$money
,
//单位为分
'desc'
=>
'提现到零钱'
,
'spbill_create_ip'
=>
'192.168.0.1'
,
//发起交易的IP地址
];
...
...
请
注册
或
登录
后发表评论