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
86a1041a
Commit
86a1041a
authored
Sep 21, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
a16dac68
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+1
-1
RefundReturn.php
application/models/DAO/Order/RefundReturn.php
+0
-1
No files found.
application/models/Business/Store/ShopkeeperService.php
View file @
86a1041a
...
@@ -505,7 +505,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
...
@@ -505,7 +505,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
if
(
!
empty
(
$ordersCount
)
&&
!
empty
(
$refundLists
)){
if
(
!
empty
(
$ordersCount
)
&&
!
empty
(
$refundLists
)){
foreach
(
$ordersCount
as
&
$order
){
foreach
(
$ordersCount
as
&
$order
){
foreach
(
$refundLists
as
$refund
){
foreach
(
$refundLists
as
$refund
){
if
(
$order
[
'buyerId'
]
==
$refund
[
'buyerId'
]
and
$order
[
'storeId'
]
==
$refund
[
'storeId'
]){
if
(
$order
[
'buyerId'
]
==
$refund
[
'buyerId'
]
&&
$order
[
'storeId'
]
==
$refund
[
'storeId'
]){
$order
[
'orderTotal'
]
=
$order
[
'orderTotal'
]
-
$refund
[
'refundTotal'
];
$order
[
'orderTotal'
]
=
$order
[
'orderTotal'
]
-
$refund
[
'refundTotal'
];
}
}
}
}
...
...
application/models/DAO/Order/RefundReturn.php
View file @
86a1041a
...
@@ -436,7 +436,6 @@ class RefundReturnModel extends \DAO\AbstractModel {
...
@@ -436,7 +436,6 @@ class RefundReturnModel extends \DAO\AbstractModel {
public
function
getMemberStoreStaticsByGmtUpdate
(
$gmtUpdate
,
$pageIndex
,
$pageSize
){
public
function
getMemberStoreStaticsByGmtUpdate
(
$gmtUpdate
,
$pageIndex
,
$pageSize
){
$this
->
setDb
(
$this
->
dbName
);
$this
->
setDb
(
$this
->
dbName
);
$where
=
\Our\Common
::
format
(
' gmt_update>={0} and gmt_update<{1} and refund_state={2}'
,
$gmtUpdate
,
TIMESTAMP
,
ApiConst
::
refundStateComplete
);
$where
=
\Our\Common
::
format
(
' gmt_update>={0} and gmt_update<{1} and refund_state={2}'
,
$gmtUpdate
,
TIMESTAMP
,
ApiConst
::
refundStateComplete
);
echo
$where
.
'|'
.
$this
->
sumField
.
$pageIndex
.
$pageSize
.
';'
;
$res
=
$this
->
lists
(
$where
,
array
(
'gmt_update'
=>
'asc'
),
$this
->
sumField
,
$pageIndex
,
$pageSize
);
$res
=
$this
->
lists
(
$where
,
array
(
'gmt_update'
=>
'asc'
),
$this
->
sumField
,
$pageIndex
,
$pageSize
);
return
$res
[
'list'
]
?
$res
:
false
;
return
$res
[
'list'
]
?
$res
:
false
;
}
}
...
...
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