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
338ec5ad
Commit
338ec5ad
authored
Nov 16, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单支付结果
parent
a3c34e56
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
OrderService.php
application/models/Business/Order/OrderService.php
+3
-1
No files found.
application/models/Business/Order/OrderService.php
View file @
338ec5ad
...
@@ -965,6 +965,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -965,6 +965,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderIds
=
array
();
$orderIds
=
array
();
$orderNos
=
array
();
$orderNos
=
array
();
$orderState
=
\Our\ApiConst
::
one
;
$orderState
=
\Our\ApiConst
::
one
;
$dlyoPickupCode
=
\Our\NameConst
::
emptyString
;
foreach
(
$orderList
as
$order
)
{
foreach
(
$orderList
as
$order
)
{
$orderNos
[]
=
$order
[
'order_sn'
];
$orderNos
[]
=
$order
[
'order_sn'
];
if
(
$order
[
'order_state'
]
==
\Our\ApiConst
::
orderStateWaitPay
)
{
if
(
$order
[
'order_state'
]
==
\Our\ApiConst
::
orderStateWaitPay
)
{
...
@@ -995,7 +996,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -995,7 +996,7 @@ class OrderServiceModel extends \Business\AbstractModel
$orderContent
[
'payway'
]
=
\Our\DescribeConst
::
afterPay
;
$orderContent
[
'payway'
]
=
\Our\DescribeConst
::
afterPay
;
}
}
$orderContent
[
'orderAmount'
]
=
$order
[
'order_amount'
];
$orderContent
[
'orderAmount'
]
=
$order
[
'order_amount'
];
$
orderContent
[
'dlyoPickupCode'
]
=
substr
(
$order
[
'order_sn'
],
ApiConst
::
positionPickupCodeBegin
);
$
dlyoPickupCode
=
substr
(
$order
[
'order_sn'
],
ApiConst
::
positionPickupCodeBegin
);
$orderContents
[]
=
$orderContent
;
$orderContents
[]
=
$orderContent
;
}
}
$orderIds
[]
=
$order
[
'order_id'
];
$orderIds
[]
=
$order
[
'order_id'
];
...
@@ -1024,6 +1025,7 @@ class OrderServiceModel extends \Business\AbstractModel
...
@@ -1024,6 +1025,7 @@ class OrderServiceModel extends \Business\AbstractModel
$return
[
'orderTips'
]
=
$orderTips
;
$return
[
'orderTips'
]
=
$orderTips
;
$return
[
'orderSubTips'
]
=
$orderSubTips
;
$return
[
'orderSubTips'
]
=
$orderSubTips
;
$return
[
'orderContents'
]
=
$orderContents
;
$return
[
'orderContents'
]
=
$orderContents
;
$return
[
'dlyoPickupCode'
]
=
$dlyoPickupCode
;
$return
[
'coupons'
]
=
$this
->
getGiftCouponsByOrderIds
(
$orderIds
,
$memberId
);
$return
[
'coupons'
]
=
$this
->
getGiftCouponsByOrderIds
(
$orderIds
,
$memberId
);
return
$return
;
return
$return
;
}
}
...
...
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