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
f3274493
Commit
f3274493
authored
Sep 07, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
测试
parent
6ab52ae8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
OrderService.php
application/models/Business/Order/OrderService.php
+1
-1
No files found.
application/models/Business/Order/OrderService.php
View file @
f3274493
...
@@ -889,7 +889,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -889,7 +889,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderSubTips
=
\Our\DescribeConst
::
payFailedSubTips
;
$orderSubTips
=
\Our\DescribeConst
::
payFailedSubTips
;
$orderState
=
\Our\ApiConst
::
zero
;
$orderState
=
\Our\ApiConst
::
zero
;
break
;
break
;
}
else
if
((
$order
[
'payment_type'
]
==
\Our\ApiConst
::
payOffline
&&
$order
[
'payment_type'
]
==
\Our\ApiConst
::
payAog
)
&&
$order
[
'order_state'
]
==
\Our\ApiConst
::
orderStateWaitConfirm
)
{
//已下单的待线上支付订单
}
else
if
((
$order
[
'payment_type'
]
==
\Our\ApiConst
::
payOffline
||
$order
[
'payment_type'
]
==
\Our\ApiConst
::
payAog
)
&&
$order
[
'order_state'
]
==
\Our\ApiConst
::
orderStateWaitConfirm
)
{
//已下单的待线上支付订单
$orderTips
=
\Our\DescribeConst
::
addOrderSuccessTips
;
$orderTips
=
\Our\DescribeConst
::
addOrderSuccessTips
;
$store
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$order
[
'store_id'
]),
\Our\ApiConst
::
oneHour
);
$store
=
\Our\RedisHelper
::
cachedFunction
(
\Redis\Db6\StoreRedisModel
::
getInstance
(),
array
(
&
$storeDao
,
'getInfoById'
),
array
(
$order
[
'store_id'
]),
\Our\ApiConst
::
oneHour
);
$orderContent
[
'storeName'
]
=
$store
[
'store_name'
];
$orderContent
[
'storeName'
]
=
$store
[
'store_name'
];
...
...
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