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
c445bc63
Commit
c445bc63
authored
Nov 24, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
6f46c9b8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
OrderService.php
application/models/Business/Order/OrderService.php
+1
-1
ShopkeeperService.php
application/models/Business/Store/ShopkeeperService.php
+2
-0
OrderLog.php
application/models/DAO/Order/OrderLog.php
+1
-1
No files found.
application/models/Business/Order/OrderService.php
View file @
c445bc63
...
...
@@ -918,7 +918,7 @@ class OrderServiceModel extends \Business\AbstractModel
$data
[
'order_amount'
]
=
$newOrderAmount
;
$res
=
$orderDao
->
updateByOrderId
(
$data
,
$orderId
);
$orderDao
->
deleteOrderCache
(
$orderDetail
[
'memberId'
],
$orderId
,
$storeId
,
true
);
$storeDao
->
$storeDao
->
deleteStoreCache
(
$storeId
,
$orderId
);
$orderLogDao
->
add
(
$orderDetail
[
'orderId'
],
ArrayConst
::
logMsgType
[
ApiConst
::
sellerUpdateOrderAmount
],
DescribeConst
::
sellerLog
,
$memberName
,
$orderDetail
[
'orderState'
]);
return
$res
;
}
...
...
application/models/Business/Store/ShopkeeperService.php
View file @
c445bc63
...
...
@@ -239,6 +239,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
$where
[
'store_id'
]
=
$storeId
;
$where
[
'order_state'
]
=
ApiConst
::
orderStateWaitConfirm
;
$orderDao
=
\DAO\Order\OrderModel
::
getInstance
(
DbNameConst
::
masterDBConnectName
);
$storeDao
=
\DAO\StoreModel
::
getInstance
();
$order
=
$orderDao
->
find
(
$where
);
if
(
empty
(
$order
))
{
if
(
empty
(
$storeId
))
{
...
...
@@ -272,6 +273,7 @@ class ShopkeeperServiceModel extends \Business\AbstractModel
// \Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>ApiConst::messageWaitReceive,'op'=>NameConst::reduce,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
//\Our\RedisHelper::rpush('client_push',array('storeId'=>$order['storeId'],'type'=>$type,'op'=>NameConst::add,'num'=>ApiConst::one,'params'=>array('c'=>'shopkeeper','m'=>'orderDetail','orderId'=>$order['orderId'])));
$orderDao
->
deleteOrderCache
(
$order
[
'buyer_id'
],
$orderId
,
$order
[
'store_id'
],
true
);
$storeDao
->
deleteStoreCache
(
$order
[
'store_id'
],
$orderId
);
// \Our\RedisHelper::memberTotalFromStateToState($order['buyer_id'], $order['order_state'], ApiConst::orderStateWaitSend);
return
$result
;
}
...
...
application/models/DAO/Order/OrderLog.php
View file @
c445bc63
...
...
@@ -52,7 +52,7 @@ class OrderLogModel extends \DAO\AbstractModel
$data
[
'log_user'
]
=
$logUser
;
$data
[
'log_orderstate'
]
=
$logOrderState
;
$data
[
'log_time'
]
=
TIMESTAMP
;
return
$this
->
addLog
ToMongo
(
$data
);
return
$this
->
addLog
(
$data
);
}
public
function
addLog
(
$log
){
$this
->
setDb
(
$this
->
dbName
);
...
...
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