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
f28b1cad
Commit
f28b1cad
authored
Dec 11, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
temp
parent
0f08c597
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
0 deletions
+2
-0
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+2
-0
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
f28b1cad
...
@@ -323,6 +323,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -323,6 +323,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$orders
,
$qmDeliveryManLogs
[
'list'
],
'orderId'
,
'orderId'
);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$orders
,
$qmDeliveryManLogs
[
'list'
],
'orderId'
,
'orderId'
);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$ordersOrderCommons
,
$orderCommons
,
'orderId'
,
'orderId'
);
$ordersOrderCommons
=
Common
::
intergrateOneToOne
(
$ordersOrderCommons
,
$orderCommons
,
'orderId'
,
'orderId'
);
$orderMerge
=
\Our\Common
::
intergrateOneToMany
(
$ordersOrderCommons
,
$orderGoods
,
'orderId'
,
'orderId'
,
'orderGoods'
,
'addTime'
);
$orderMerge
=
\Our\Common
::
intergrateOneToMany
(
$ordersOrderCommons
,
$orderGoods
,
'orderId'
,
'orderId'
,
'orderGoods'
,
'addTime'
);
$orderConvert
=
$orderDao
->
convertOrder
(
$orders
,
'orderId'
);
foreach
(
$orderMerge
as
&
$value
)
{
foreach
(
$orderMerge
as
&
$value
)
{
$value
[
'orderStateName'
]
=
$orderDao
->
getStatusText
(
$value
);
$value
[
'orderStateName'
]
=
$orderDao
->
getStatusText
(
$value
);
$value
[
'orderText'
]
=
$orderDao
->
getText
(
$value
,
ApiConst
::
orderListDescribe
);
$value
[
'orderText'
]
=
$orderDao
->
getText
(
$value
,
ApiConst
::
orderListDescribe
);
...
@@ -359,6 +360,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -359,6 +360,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
}
else
{
}
else
{
unset
(
$value
[
'reciverInfo'
]);
unset
(
$value
[
'reciverInfo'
]);
}
}
$value
[
'addTime'
]
=
$orderConvert
[
$value
[
'orderId'
]][
'addTime'
];
unset
(
$value
[
'couponId'
]);
unset
(
$value
[
'couponId'
]);
unset
(
$value
[
'refundAmount'
]);
unset
(
$value
[
'refundAmount'
]);
unset
(
$value
[
'distributionFee'
]);
unset
(
$value
[
'distributionFee'
]);
...
...
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