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
7b700b17
Commit
7b700b17
authored
Sep 10, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
752838d0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
ApiConst.php
application/library/Our/ApiConst.php
+2
-0
Order.php
application/models/DAO/Order/Order.php
+2
-3
RefundReturn.php
application/models/DAO/Order/RefundReturn.php
+1
-0
No files found.
application/library/Our/ApiConst.php
View file @
7b700b17
...
...
@@ -162,6 +162,8 @@ class ApiConst
//平台介入
const
platIn
=
1
;
const
platNotIn
=
0
;
//平台介入中
const
platProccess
=
2
;
//平台审核状态
const
refundPlatformVerify
=
0
;
const
refundPlatformAgree
=
1
;
...
...
application/models/DAO/Order/Order.php
View file @
7b700b17
...
...
@@ -787,14 +787,13 @@ class OrderModel extends \DAO\AbstractModel
}
//删除订单缓存
public
function
deleteOrderCache
(
$memberId
,
$orderId
=
false
,
$stroeId
=
false
,
$deleteGetShopKeeperCountByStoreId
=
false
,
$deleteGetFavoritesCountByStoreId
=
false
,
$diliverymanId
=
0
)
public
function
deleteOrderCache
(
$memberId
,
$orderId
=
false
,
$stroeId
=
false
,
$deleteGetShopKeeperCountByStoreId
=
false
,
$deleteGetFavoritesCountByStoreId
=
false
,
$diliverymanId
=
ApiConst
::
zero
)
{
if
(
!
empty
(
$memberId
))
{
$this
->
deleteGetListByMemberId
(
$memberId
);
\DAO\MemberModel
::
getInstance
()
->
deleteTotalCache
(
$memberId
);
}
if
(
!
empty
(
$stroeId
))
{
if
(
$deleteGetShopKeeperCountByStoreId
)
{
$this
->
deleteGetShopKeeperCountByStoreId
(
$stroeId
);
...
...
@@ -885,7 +884,7 @@ class OrderModel extends \DAO\AbstractModel
$limit
=
TIMESTAMP
-
$timeLimit
;
$where
[
$timeField
]
=
array
(
'lt'
,
$limit
);
$where
=
$this
->
db
->
getSqlWhereByArray
(
$where
);
return
$this
->
db
->
update
(
$this
->
_tableName
)
->
where
(
$where
)
->
rows
(
array
(
'order_state'
=>
$toState
))
->
execute
();
return
$this
->
db
->
update
(
$this
->
_tableName
)
->
where
(
$where
)
->
rows
(
array
(
'order_state'
=>
$toState
,
'gmt_update'
=>
$toState
))
->
execute
();
}
...
...
application/models/DAO/Order/RefundReturn.php
View file @
7b700b17
...
...
@@ -100,6 +100,7 @@ class RefundReturnModel extends \DAO\AbstractModel {
$where
[
'refund_id'
]
=
$refundId
;
$where
[
'buyer_id'
]
=
$buyerId
;
$data
[
'is_platform_in'
]
=
ApiConst
::
platIn
;
$data
[
'refund_state'
]
=
ApiConst
::
platProccess
;
$data
[
'platform_in_reason'
]
=
$applyMessage
;
return
$this
->
update
(
$where
,
$data
);
}
...
...
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