Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
62ffedcc
Commit
62ffedcc
authored
Nov 05, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
清除日志
parent
ce14b798
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
9 deletions
+2
-9
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+0
-2
PaymentService.php
application/models/Business/Order/PaymentService.php
+0
-3
Order.php
application/models/DAO/Order/Order.php
+0
-2
application.ini
conf/application.ini
+2
-2
No files found.
application/library/Order/OrderConfirmUtil.php
View file @
62ffedcc
...
...
@@ -932,13 +932,11 @@ class OrderConfirmUtil {
$orderPayModel
=
\DAO\Order\OrderPayModel
::
getInstance
(
$dbName
);
$orderModel
->
db
->
doTransaction
();
$paySn
=
$data
[
'paySn'
];
\Our\Log
::
getInstance
()
->
write
(
$paySn
,
'/data/log/applog'
);
if
(
!
$paySn
){
$errorCode
=
\Error\CodeConfigModel
::
emptyPaySnForOrder
;
return
array
(
'flag'
=>
\Our\ApiConst
::
zero
,
'errorCode'
=>
$errorCode
,
'data'
=>
$data
);
}
$oldOrderPay
=
$orderPayModel
->
find
(
array
(
'pay_sn'
=>
$paySn
));
\Our\Log
::
getInstance
()
->
write
(
json_encode
(
$oldOrderPay
,
true
),
'/data/log/applog'
);
if
(
$oldOrderPay
[
'api_pay_state'
]
==
\Our\ApiConst
::
one
){
return
array
(
'flag'
=>
\Our\ApiConst
::
one
,
'errorCode'
=>
$errorCode
);
}
...
...
application/models/Business/Order/PaymentService.php
View file @
62ffedcc
...
...
@@ -41,7 +41,6 @@ class PaymentServiceModel extends \Business\AbstractModel{
* app微信支付回调
*/
public
function
updateOrderToPayed
(
$channel
=
\Our\NameConst
::
wxAppChannel
){
\Our\Log
::
getInstance
()
->
write
(
'test'
,
'/data/log/applog'
);
if
(
$channel
==
\Our\NameConst
::
wxLiteChannel
){
$wxpay
=
\Payment\WxLitePay
::
getInstance
();
$param
[
'pay_type'
]
=
\Our\ApiConst
::
wxLitePayType
;
...
...
@@ -53,14 +52,12 @@ class PaymentServiceModel extends \Business\AbstractModel{
$param
[
'pay_type'
]
=
\Our\ApiConst
::
wxAppPayType
;
}
$callbackInfo
=
$wxpay
->
getNotifyInfo
();
\Our\Log
::
getInstance
()
->
write
(
serialize
(
$callbackInfo
),
'/data/log/applog'
);
if
(
$callbackInfo
)
{
//验证成功
$param
[
'paySn'
]
=
$callbackInfo
[
'out_trade_no'
];
$orderConfirmUtil
=
\Order\OrderConfirmUtil
::
getInstance
();
$return
=
$orderConfirmUtil
->
updateOrderToPayed
(
$param
);
if
(
$return
[
'flag'
])
{
\Our\Log
::
getInstance
()
->
write
(
$callbackInfo
[
'returnXml'
],
'/data/log/applog'
);
echo
$callbackInfo
[
'returnXml'
];
die
;
}
...
...
application/models/DAO/Order/Order.php
View file @
62ffedcc
...
...
@@ -234,7 +234,6 @@ class OrderModel extends \DAO\AbstractModel
}
$data
[
'gmt_update'
]
=
TIMESTAMP
;
$result
=
$this
->
db
->
update
(
$this
->
_tableName
)
->
where
(
$where
)
->
rows
(
$data
)
->
execute
();
\Our\Log
::
getInstance
()
->
write
(
$this
->
db
->
getLastSql
(),
'/data/log/applog'
);
return
$result
;
}
...
...
@@ -976,7 +975,6 @@ class OrderModel extends \DAO\AbstractModel
$where
=
$this
->
db
->
getSqlWhereByArray
(
$where
);
}
$result
=
$this
->
db
->
select
(
$field
)
->
from
(
$this
->
_tableName
)
->
where
(
$where
)
->
fetchAll
();
\Our\Log
::
getInstance
()
->
write
(
$this
->
db
->
getLastSql
(),
'/data/log/applog'
);
return
$result
;
}
...
...
conf/application.ini
View file @
62ffedcc
...
...
@@ -354,7 +354,7 @@ elastic.master.host="192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
[lyz : common]
[lyz
test
: common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
...
...
@@ -401,7 +401,7 @@ elastic.master.host="192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
[lyz
test
: common]
[lyz : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment